diff options
504 files changed, 16485 insertions, 13453 deletions
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 48356247a49..799f1479467 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -8,24 +8,17 @@ <itemizedlist> <listitem> <para> - Use 2 spaces of indentation per indentation level in Nix expressions, 4 - spaces in shell scripts. + Use 2 spaces of indentation per indentation level in Nix expressions, 4 spaces in shell scripts. </para> </listitem> <listitem> <para> - Do not use tab characters, i.e. configure your editor to use soft tabs. - For instance, use <literal>(setq-default indent-tabs-mode nil)</literal> - in Emacs. Everybody has different tab settings so it’s asking for - trouble. + Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use <literal>(setq-default indent-tabs-mode nil)</literal> in Emacs. Everybody has different tab settings so it’s asking for trouble. </para> </listitem> <listitem> <para> - Use <literal>lowerCamelCase</literal> for variable names, not - <literal>UpperCamelCase</literal>. Note, this rule does not apply to - package attribute names, which instead follow the rules in - <xref linkend="sec-package-naming"/>. + Use <literal>lowerCamelCase</literal> for variable names, not <literal>UpperCamelCase</literal>. Note, this rule does not apply to package attribute names, which instead follow the rules in <xref linkend="sec-package-naming"/>. </para> </listitem> <listitem> @@ -52,8 +45,7 @@ foo { arg = ...; } </listitem> <listitem> <para> - In attribute sets or lists that span multiple lines, the attribute names - or list elements should be aligned: + In attribute sets or lists that span multiple lines, the attribute names or list elements should be aligned: <programlisting> # A long list. list = [ @@ -97,8 +89,7 @@ attrs = { x = 1280; y = 1024; }; </listitem> <listitem> <para> - Breaking in the middle of a function argument can give hard-to-read code, - like + Breaking in the middle of a function argument can give hard-to-read code, like <programlisting> someFunction { x = 1280; y = 1024; } otherArg @@ -123,8 +114,7 @@ in someFunction res otherArg yetAnotherArg </listitem> <listitem> <para> - The bodies of functions, asserts, and withs are not indented to prevent a - lot of superfluous indentation levels, i.e. + The bodies of functions, asserts, and withs are not indented to prevent a lot of superfluous indentation levels, i.e. <programlisting> { arg1, arg2 }: assert system == "i686-linux"; @@ -156,8 +146,7 @@ stdenv.mkDerivation { ... </listitem> <listitem> <para> - Functions should list their expected arguments as precisely as possible. - That is, write + Functions should list their expected arguments as precisely as possible. That is, write <programlisting> { stdenv, fetchurl, perl }: <replaceable>...</replaceable> </programlisting> @@ -171,9 +160,7 @@ args: with args; <replaceable>...</replaceable> </programlisting> </para> <para> - For functions that are truly generic in the number of arguments (such as - wrappers around <varname>mkDerivation</varname>) that have some required - arguments, you should write them using an <literal>@</literal>-pattern: + For functions that are truly generic in the number of arguments (such as wrappers around <varname>mkDerivation</varname>) that have some required arguments, you should write them using an <literal>@</literal>-pattern: <programlisting> { stdenv, doCoverageAnalysis ? false, ... } @ args: @@ -197,35 +184,20 @@ args.stdenv.mkDerivation (args // { <title>Package naming</title> <para> - The key words <emphasis>must</emphasis>, <emphasis>must not</emphasis>, - <emphasis>required</emphasis>, <emphasis>shall</emphasis>, <emphasis>shall - not</emphasis>, <emphasis>should</emphasis>, <emphasis>should - not</emphasis>, <emphasis>recommended</emphasis>, <emphasis>may</emphasis>, - and <emphasis>optional</emphasis> in this section are to be interpreted as - described in <link xlink:href="https://tools.ietf.org/html/rfc2119">RFC - 2119</link>. Only <emphasis>emphasized</emphasis> words are to be - interpreted in this way. + The key words <emphasis>must</emphasis>, <emphasis>must not</emphasis>, <emphasis>required</emphasis>, <emphasis>shall</emphasis>, <emphasis>shall not</emphasis>, <emphasis>should</emphasis>, <emphasis>should not</emphasis>, <emphasis>recommended</emphasis>, <emphasis>may</emphasis>, and <emphasis>optional</emphasis> in this section are to be interpreted as described in <link xlink:href="https://tools.ietf.org/html/rfc2119">RFC 2119</link>. Only <emphasis>emphasized</emphasis> words are to be interpreted in this way. </para> <para> - In Nixpkgs, there are generally three different names associated with a - package: + In Nixpkgs, there are generally three different names associated with a package: <itemizedlist> <listitem> <para> - The <varname>name</varname> attribute of the derivation (excluding the - version part). This is what most users see, in particular when using - <command>nix-env</command>. + The <varname>name</varname> attribute of the derivation (excluding the version part). This is what most users see, in particular when using <command>nix-env</command>. </para> </listitem> <listitem> <para> - The variable name used for the instantiated package in - <filename>all-packages.nix</filename>, and when passing it as a - dependency to other functions. Typically this is called the - <emphasis>package attribute name</emphasis>. This is what Nix expression - authors see. It can also be used when installing using <command>nix-env - -iA</command>. + The variable name used for the instantiated package in <filename>all-packages.nix</filename>, and when passing it as a dependency to other functions. Typically this is called the <emphasis>package attribute name</emphasis>. This is what Nix expression authors see. It can also be used when installing using <command>nix-env -iA</command>. </para> </listitem> <listitem> @@ -234,12 +206,7 @@ args.stdenv.mkDerivation (args // { </para> </listitem> </itemizedlist> - Most of the time, these are the same. For instance, the package - <literal>e2fsprogs</literal> has a <varname>name</varname> attribute - <literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is bound - to the variable name <varname>e2fsprogs</varname> in - <filename>all-packages.nix</filename>, and the Nix expression is in - <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>. + Most of the time, these are the same. For instance, the package <literal>e2fsprogs</literal> has a <varname>name</varname> attribute <literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is bound to the variable name <varname>e2fsprogs</varname> in <filename>all-packages.nix</filename>, and the Nix expression is in <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>. </para> <para> @@ -247,51 +214,32 @@ args.stdenv.mkDerivation (args // { <itemizedlist> <listitem> <para> - The <literal>name</literal> attribute <emphasis>should</emphasis> be - identical to the upstream package name. + The <literal>name</literal> attribute <emphasis>should</emphasis> be identical to the upstream package name. </para> </listitem> <listitem> <para> - The <literal>name</literal> attribute <emphasis>must not</emphasis> - contain uppercase letters — e.g., <literal>"mplayer-1.0rc2"</literal> - instead of <literal>"MPlayer-1.0rc2"</literal>. + The <literal>name</literal> attribute <emphasis>must not</emphasis> contain uppercase letters — e.g., <literal>"mplayer-1.0rc2"</literal> instead of <literal>"MPlayer-1.0rc2"</literal>. </para> </listitem> <listitem> <para> - The version part of the <literal>name</literal> attribute - <emphasis>must</emphasis> start with a digit (following a dash) — e.g., - <literal>"hello-0.3.1rc2"</literal>. + The version part of the <literal>name</literal> attribute <emphasis>must</emphasis> start with a digit (following a dash) — e.g., <literal>"hello-0.3.1rc2"</literal>. </para> </listitem> <listitem> <para> - If a package is not a release but a commit from a repository, then the - version part of the name <emphasis>must</emphasis> be the date of that - (fetched) commit. The date <emphasis>must</emphasis> be in - <literal>"YYYY-MM-DD"</literal> format. Also append - <literal>"unstable"</literal> to the name - e.g., - <literal>"pkgname-unstable-2014-09-23"</literal>. + If a package is not a release but a commit from a repository, then the version part of the name <emphasis>must</emphasis> be the date of that (fetched) commit. The date <emphasis>must</emphasis> be in <literal>"YYYY-MM-DD"</literal> format. Also append <literal>"unstable"</literal> to the name - e.g., <literal>"pkgname-unstable-2014-09-23"</literal>. </para> </listitem> <listitem> <para> - Dashes in the package name <emphasis>should</emphasis> be preserved in - new variable names, rather than converted to underscores or camel cased - — e.g., <varname>http-parser</varname> instead of - <varname>http_parser</varname> or <varname>httpParser</varname>. The - hyphenated style is preferred in all three package names. + Dashes in the package name <emphasis>should</emphasis> be preserved in new variable names, rather than converted to underscores or camel cased — e.g., <varname>http-parser</varname> instead of <varname>http_parser</varname> or <varname>httpParser</varname>. The hyphenated style is preferred in all three package names. </para> </listitem> <listitem> <para> - If there are multiple versions of a package, this - <emphasis>should</emphasis> be reflected in the variable names in - <filename>all-packages.nix</filename>, e.g. <varname>json-c-0-9</varname> - and <varname>json-c-0-11</varname>. If there is an obvious “default” - version, make an attribute like <literal>json-c = json-c-0-9;</literal>. - See also <xref linkend="sec-versioning" /> + If there are multiple versions of a package, this <emphasis>should</emphasis> be reflected in the variable names in <filename>all-packages.nix</filename>, e.g. <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>. If there is an obvious “default” version, make an attribute like <literal>json-c = json-c-0-9;</literal>. See also <xref linkend="sec-versioning" /> </para> </listitem> </itemizedlist> @@ -301,31 +249,18 @@ args.stdenv.mkDerivation (args // { <title>File naming and organisation</title> <para> - Names of files and directories should be in lowercase, with dashes between - words — not in camel case. For instance, it should be - <filename>all-packages.nix</filename>, not - <filename>allPackages.nix</filename> or - <filename>AllPackages.nix</filename>. + Names of files and directories should be in lowercase, with dashes between words — not in camel case. For instance, it should be <filename>all-packages.nix</filename>, not <filename>allPackages.nix</filename> or <filename>AllPackages.nix</filename>. </para> <section xml:id="sec-hierarchy"> <title>Hierarchy</title> <para> - Each package should be stored in its own directory somewhere in the - <filename>pkgs/</filename> tree, i.e. in - <filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>. - Below are some rules for picking the right category for a package. Many - packages fall under several categories; what matters is the - <emphasis>primary</emphasis> purpose of a package. For example, the - <literal>libxml2</literal> package builds both a library and some tools; - but it’s a library foremost, so it goes under - <filename>pkgs/development/libraries</filename>. + Each package should be stored in its own directory somewhere in the <filename>pkgs/</filename> tree, i.e. in <filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>. Below are some rules for picking the right category for a package. Many packages fall under several categories; what matters is the <emphasis>primary</emphasis> purpose of a package. For example, the <literal>libxml2</literal> package builds both a library and some tools; but it’s a library foremost, so it goes under <filename>pkgs/development/libraries</filename>. </para> <para> - When in doubt, consider refactoring the <filename>pkgs/</filename> tree, - e.g. creating new categories or splitting up an existing category. + When in doubt, consider refactoring the <filename>pkgs/</filename> tree, e.g. creating new categories or splitting up an existing category. </para> <variablelist> @@ -341,8 +276,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/libraries</filename> (e.g. - <filename>libxml2</filename>) + <filename>development/libraries</filename> (e.g. <filename>libxml2</filename>) </para> </listitem> </varlistentry> @@ -352,8 +286,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/compilers</filename> (e.g. - <filename>gcc</filename>) + <filename>development/compilers</filename> (e.g. <filename>gcc</filename>) </para> </listitem> </varlistentry> @@ -363,8 +296,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/interpreters</filename> (e.g. - <filename>guile</filename>) + <filename>development/interpreters</filename> (e.g. <filename>guile</filename>) </para> </listitem> </varlistentry> @@ -380,8 +312,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/tools/parsing</filename> (e.g. - <filename>bison</filename>, <filename>flex</filename>) + <filename>development/tools/parsing</filename> (e.g. <filename>bison</filename>, <filename>flex</filename>) </para> </listitem> </varlistentry> @@ -391,8 +322,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/tools/build-managers</filename> (e.g. - <filename>gnumake</filename>) + <filename>development/tools/build-managers</filename> (e.g. <filename>gnumake</filename>) </para> </listitem> </varlistentry> @@ -402,8 +332,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>development/tools/misc</filename> (e.g. - <filename>binutils</filename>) + <filename>development/tools/misc</filename> (e.g. <filename>binutils</filename>) </para> </listitem> </varlistentry> @@ -429,8 +358,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - (A tool is a relatively small program, especially one intended to be - used non-interactively.) + (A tool is a relatively small program, especially one intended to be used non-interactively.) </para> <variablelist> <varlistentry> @@ -439,8 +367,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>tools/networking</filename> (e.g. - <filename>wget</filename>) + <filename>tools/networking</filename> (e.g. <filename>wget</filename>) </para> </listitem> </varlistentry> @@ -470,8 +397,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>tools/archivers</filename> (e.g. <filename>zip</filename>, - <filename>tar</filename>) + <filename>tools/archivers</filename> (e.g. <filename>zip</filename>, <filename>tar</filename>) </para> </listitem> </varlistentry> @@ -481,8 +407,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>tools/compression</filename> (e.g. - <filename>gzip</filename>, <filename>bzip2</filename>) + <filename>tools/compression</filename> (e.g. <filename>gzip</filename>, <filename>bzip2</filename>) </para> </listitem> </varlistentry> @@ -492,8 +417,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>tools/security</filename> (e.g. <filename>nmap</filename>, - <filename>gnupg</filename>) + <filename>tools/security</filename> (e.g. <filename>nmap</filename>, <filename>gnupg</filename>) </para> </listitem> </varlistentry> @@ -532,8 +456,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>servers/http</filename> (e.g. - <filename>apache-httpd</filename>) + <filename>servers/http</filename> (e.g. <filename>apache-httpd</filename>) </para> </listitem> </varlistentry> @@ -543,8 +466,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>servers/x11</filename> (e.g. <filename>xorg</filename> — - this includes the client libraries and programs) + <filename>servers/x11</filename> (e.g. <filename>xorg</filename> — this includes the client libraries and programs) </para> </listitem> </varlistentry> @@ -567,8 +489,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>desktops</filename> (e.g. <filename>kde</filename>, - <filename>gnome</filename>, <filename>enlightenment</filename>) + <filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>) </para> </listitem> </varlistentry> @@ -578,8 +499,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/window-managers</filename> (e.g. - <filename>awesome</filename>, <filename>stumpwm</filename>) + <filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>) </para> </listitem> </varlistentry> @@ -589,8 +509,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - A (typically large) program with a distinct user interface, primarily - used interactively. + A (typically large) program with a distinct user interface, primarily used interactively. </para> <variablelist> <varlistentry> @@ -599,8 +518,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/version-management</filename> (e.g. - <filename>subversion</filename>) + <filename>applications/version-management</filename> (e.g. <filename>subversion</filename>) </para> </listitem> </varlistentry> @@ -610,8 +528,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/video</filename> (e.g. - <filename>vlc</filename>) + <filename>applications/video</filename> (e.g. <filename>vlc</filename>) </para> </listitem> </varlistentry> @@ -621,8 +538,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/graphics</filename> (e.g. - <filename>gimp</filename>) + <filename>applications/graphics</filename> (e.g. <filename>gimp</filename>) </para> </listitem> </varlistentry> @@ -638,8 +554,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/networking/mailreaders</filename> (e.g. - <filename>thunderbird</filename>) + <filename>applications/networking/mailreaders</filename> (e.g. <filename>thunderbird</filename>) </para> </listitem> </varlistentry> @@ -649,8 +564,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/networking/newsreaders</filename> (e.g. - <filename>pan</filename>) + <filename>applications/networking/newsreaders</filename> (e.g. <filename>pan</filename>) </para> </listitem> </varlistentry> @@ -660,8 +574,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>applications/networking/browsers</filename> (e.g. - <filename>firefox</filename>) + <filename>applications/networking/browsers</filename> (e.g. <filename>firefox</filename>) </para> </listitem> </varlistentry> @@ -719,8 +632,7 @@ args.stdenv.mkDerivation (args // { </term> <listitem> <para> - <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g. - <filename>docbook</filename>) + <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g. <filename>docbook</filename>) </para> </listitem> </varlistentry> @@ -733,8 +645,7 @@ args.stdenv.mkDerivation (args // { (Okay, these are executable...) </para> <para> - <filename>data/sgml+xml/stylesheets/xslt</filename> (e.g. - <filename>docbook-xsl</filename>) + <filename>data/sgml+xml/stylesheets/xslt</filename> (e.g. <filename>docbook-xsl</filename>) </para> </listitem> </varlistentry> @@ -771,36 +682,15 @@ args.stdenv.mkDerivation (args // { <title>Versioning</title> <para> - Because every version of a package in Nixpkgs creates a potential - maintenance burden, old versions of a package should not be kept unless - there is a good reason to do so. For instance, Nixpkgs contains several - versions of GCC because other packages don’t build with the latest - version of GCC. Other examples are having both the latest stable and latest - pre-release version of a package, or to keep several major releases of an - application that differ significantly in functionality. + Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality. </para> <para> - If there is only one version of a package, its Nix expression should be - named <filename>e2fsprogs/default.nix</filename>. If there are multiple - versions, this should be reflected in the filename, e.g. - <filename>e2fsprogs/1.41.8.nix</filename> and - <filename>e2fsprogs/1.41.9.nix</filename>. The version in the filename - should leave out unnecessary detail. For instance, if we keep the latest - Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named - <filename>firefox/2.0.nix</filename> and - <filename>firefox/3.5.nix</filename>, respectively (which, at a given - point, might contain versions <literal>2.0.0.20</literal> and - <literal>3.5.4</literal>). If a version requires many auxiliary files, you - can use a subdirectory for each version, e.g. - <filename>firefox/2.0/default.nix</filename> and - <filename>firefox/3.5/default.nix</filename>. + If there is only one version of a package, its Nix expression should be named <filename>e2fsprogs/default.nix</filename>. If there are multiple versions, this should be reflected in the filename, e.g. <filename>e2fsprogs/1.41.8.nix</filename> and <filename>e2fsprogs/1.41.9.nix</filename>. The version in the filename should leave out unnecessary detail. For instance, if we keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named <filename>firefox/2.0.nix</filename> and <filename>firefox/3.5.nix</filename>, respectively (which, at a given point, might contain versions <literal>2.0.0.20</literal> and <literal>3.5.4</literal>). If a version requires many auxiliary files, you can use a subdirectory for each version, e.g. <filename>firefox/2.0/default.nix</filename> and <filename>firefox/3.5/default.nix</filename>. </para> <para> - All versions of a package <emphasis>must</emphasis> be included in - <filename>all-packages.nix</filename> to make sure that they evaluate - correctly. + All versions of a package <emphasis>must</emphasis> be included in <filename>all-packages.nix</filename> to make sure that they evaluate correctly. </para> </section> </section> @@ -808,25 +698,15 @@ args.stdenv.mkDerivation (args // { <title>Fetching Sources</title> <para> - There are multiple ways to fetch a package source in nixpkgs. The general - guideline is that you should package reproducible sources with a high degree - of availability. Right now there is only one fetcher which has mirroring - support and that is <literal>fetchurl</literal>. Note that you should also - prefer protocols which have a corresponding proxy environment variable. + There are multiple ways to fetch a package source in nixpkgs. The general guideline is that you should package reproducible sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is <literal>fetchurl</literal>. Note that you should also prefer protocols which have a corresponding proxy environment variable. </para> <para> - You can find many source fetch helpers in - <literal>pkgs/build-support/fetch*</literal>. + You can find many source fetch helpers in <literal>pkgs/build-support/fetch*</literal>. </para> <para> - In the file <literal>pkgs/top-level/all-packages.nix</literal> you can find - fetch helpers, these have names on the form <literal>fetchFrom*</literal>. - The intention of these are to provide snapshot fetches but using the same - api as some of the version controlled fetchers from - <literal>pkgs/build-support/</literal>. As an example going from bad to - good: + In the file <literal>pkgs/top-level/all-packages.nix</literal> you can find fetch helpers, these have names on the form <literal>fetchFrom*</literal>. The intention of these are to provide snapshot fetches but using the same api as some of the version controlled fetchers from <literal>pkgs/build-support/</literal>. As an example going from bad to good: <itemizedlist> <listitem> <para> @@ -863,11 +743,7 @@ src = fetchFromGitHub { sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc"; } </programlisting> - Find the value to put as <literal>sha256</literal> by running - <literal>nix run -f '<nixpkgs>' nix-prefetch-github -c - nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS - nix</literal> or <literal>nix-prefetch-url --unpack - https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>. + Find the value to put as <literal>sha256</literal> by running <literal>nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix</literal> or <literal>nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>. </para> </listitem> </itemizedlist> @@ -883,40 +759,23 @@ src = fetchFromGitHub { <orderedlist> <listitem> <para> - Prefetch URL (with <literal>nix-prefetch-<replaceable>XXX</replaceable> - <replaceable>URL</replaceable></literal>, where - <replaceable>XXX</replaceable> is one of <literal>url</literal>, - <literal>git</literal>, <literal>hg</literal>, <literal>cvs</literal>, - <literal>bzr</literal>, <literal>svn</literal>). Hash is printed to - stdout. + Prefetch URL (with <literal>nix-prefetch-<replaceable>XXX</replaceable> <replaceable>URL</replaceable></literal>, where <replaceable>XXX</replaceable> is one of <literal>url</literal>, <literal>git</literal>, <literal>hg</literal>, <literal>cvs</literal>, <literal>bzr</literal>, <literal>svn</literal>). Hash is printed to stdout. </para> </listitem> <listitem> <para> - Prefetch by package source (with <literal>nix-prefetch-url - '<nixpkgs>' -A <replaceable>PACKAGE</replaceable>.src</literal>, - where <replaceable>PACKAGE</replaceable> is package attribute name). Hash - is printed to stdout. + Prefetch by package source (with <literal>nix-prefetch-url '<nixpkgs>' -A <replaceable>PACKAGE</replaceable>.src</literal>, where <replaceable>PACKAGE</replaceable> is package attribute name). Hash is printed to stdout. </para> <para> - This works well when you've upgraded existing package version and want to - find out new hash, but is useless if package can't be accessed by - attribute or package has multiple sources (<literal>.srcs</literal>, - architecture-dependent sources, etc). + This works well when you've upgraded existing package version and want to find out new hash, but is useless if package can't be accessed by attribute or package has multiple sources (<literal>.srcs</literal>, architecture-dependent sources, etc). </para> </listitem> <listitem> <para> - Upstream provided hash: use it when upstream provides - <literal>sha256</literal> or <literal>sha512</literal> (when upstream - provides <literal>md5</literal>, don't use it, compute - <literal>sha256</literal> instead). + Upstream provided hash: use it when upstream provides <literal>sha256</literal> or <literal>sha512</literal> (when upstream provides <literal>md5</literal>, don't use it, compute <literal>sha256</literal> instead). </para> <para> - A little nuance is that <literal>nix-prefetch-*</literal> tools produce - hash encoded with <literal>base32</literal>, but upstream usually provides - hexadecimal (<literal>base16</literal>) encoding. Fetchers understand both - formats. Nixpkgs does not standardize on any one format. + A little nuance is that <literal>nix-prefetch-*</literal> tools produce hash encoded with <literal>base32</literal>, but upstream usually provides hexadecimal (<literal>base16</literal>) encoding. Fetchers understand both formats. Nixpkgs does not standardize on any one format. </para> <para> You can convert between formats with nix-hash, for example: @@ -927,28 +786,18 @@ src = fetchFromGitHub { </listitem> <listitem> <para> - Extracting hash from local source tarball can be done with - <literal>sha256sum</literal>. Use <literal>nix-prefetch-url - file:///path/to/tarball </literal> if you want base32 hash. + Extracting hash from local source tarball can be done with <literal>sha256sum</literal>. Use <literal>nix-prefetch-url file:///path/to/tarball </literal> if you want base32 hash. </para> </listitem> <listitem> <para> - Fake hash: set fake hash in package expression, perform build and extract - correct hash from error Nix prints. + Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints. </para> <para> - For package updates it is enough to change one symbol to make hash fake. - For new packages, you can use <literal>lib.fakeSha256</literal>, - <literal>lib.fakeSha512</literal> or any other fake hash. + For package updates it is enough to change one symbol to make hash fake. For new packages, you can use <literal>lib.fakeSha256</literal>, <literal>lib.fakeSha512</literal> or any other fake hash. </para> <para> - This is last resort method when reconstructing source URL is non-trivial - and <literal>nix-prefetch-url -A</literal> isn't applicable (for example, - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73"> - one of <literal>kodi</literal> dependencies</link>). The easiest way then - would be replace hash with a fake one and rebuild. Nix build will fail and - error message will contain desired hash. + This is last resort method when reconstructing source URL is non-trivial and <literal>nix-prefetch-url -A</literal> isn't applicable (for example, <link xlink:href="https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73"> one of <literal>kodi</literal> dependencies</link>). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash. </para> <warning> <para> @@ -962,9 +811,7 @@ src = fetchFromGitHub { <title>Obtaining hashes securely</title> <para> - Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead - of fetching source you can fetch malware, and instead of source hash you - get hash of malware. Here are security considerations for this scenario: + Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching source you can fetch malware, and instead of source hash you get hash of malware. Here are security considerations for this scenario: </para> <itemizedlist> @@ -975,8 +822,7 @@ src = fetchFromGitHub { </listitem> <listitem> <para> - hashes from upstream (in method 3) should be obtained via secure - protocol; + hashes from upstream (in method 3) should be obtained via secure protocol; </para> </listitem> <listitem> @@ -986,12 +832,7 @@ src = fetchFromGitHub { </listitem> <listitem> <para> - <literal>https://</literal> URLs are not secure in method 5. When - obtaining hashes with fake hash method, TLS checks are disabled. So - refetch source hash from several different networks to exclude MITM - scenario. Alternatively, use fake hash method to make Nix error, but - instead of extracting hash from error, extract - <literal>https://</literal> URL and prefetch it with method 1. + <literal>https://</literal> URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract <literal>https://</literal> URL and prefetch it with method 1. </para> </listitem> </itemizedlist> @@ -1001,8 +842,7 @@ src = fetchFromGitHub { <title>Patches</title> <para> - Patches available online should be retrieved using - <literal>fetchpatch</literal>. + Patches available online should be retrieved using <literal>fetchpatch</literal>. </para> <para> @@ -1018,10 +858,7 @@ patches = [ </para> <para> - Otherwise, you can add a <literal>.patch</literal> file to the - <literal>nixpkgs</literal> repository. In the interest of keeping our - maintenance burden to a minimum, only patches that are unique to - <literal>nixpkgs</literal> should be added in this way. + Otherwise, you can add a <literal>.patch</literal> file to the <literal>nixpkgs</literal> repository. In the interest of keeping our maintenance burden to a minimum, only patches that are unique to <literal>nixpkgs</literal> should be added in this way. </para> <para> @@ -1031,8 +868,7 @@ patches = [ ./0001-changes.patch ]; </para> <para> - If you do need to do create this sort of patch file, one way to do so is - with git: + If you do need to do create this sort of patch file, one way to do so is with git: <orderedlist> <listitem> <para> @@ -1043,8 +879,7 @@ patches = [ ./0001-changes.patch ]; </listitem> <listitem> <para> - If a git repository is not already present, create one and stage all of - the source files. + If a git repository is not already present, create one and stage all of the source files. <screen> <prompt>$ </prompt>git init <prompt>$ </prompt>git add .</screen> @@ -1052,8 +887,7 @@ patches = [ ./0001-changes.patch ]; </listitem> <listitem> <para> - Edit some files to make whatever changes need to be included in the - patch. + Edit some files to make whatever changes need to be included in the patch. </para> </listitem> <listitem> diff --git a/doc/configuration.xml b/doc/configuration.xml index b497fa4e272..cb660452d82 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -3,49 +3,38 @@ xml:id="chap-packageconfig"> <title>Global configuration</title> <para> - Nix comes with certain defaults about what packages can and cannot be - installed, based on a package's metadata. By default, Nix will prevent - installation if any of the following criteria are true: + Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true: </para> <itemizedlist> <listitem> <para> - The package is thought to be broken, and has had its - <literal>meta.broken</literal> set to <literal>true</literal>. + The package is thought to be broken, and has had its <literal>meta.broken</literal> set to <literal>true</literal>. </para> </listitem> <listitem> <para> - The package isn't intended to run on the given system, as none of its - <literal>meta.platforms</literal> match the given system. + The package isn't intended to run on the given system, as none of its <literal>meta.platforms</literal> match the given system. </para> </listitem> <listitem> <para> - The package's <literal>meta.license</literal> is set to a license which is - considered to be unfree. + The package's <literal>meta.license</literal> is set to a license which is considered to be unfree. </para> </listitem> <listitem> <para> - The package has known security vulnerabilities but has not or can not be - updated for some reason, and a list of issues has been entered in to the - package's <literal>meta.knownVulnerabilities</literal>. + The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's <literal>meta.knownVulnerabilities</literal>. </para> </listitem> </itemizedlist> <para> - Note that all this is checked during evaluation already, and the check - includes any package that is evaluated. In particular, all build-time - dependencies are checked. <literal>nix-env -qa</literal> will (attempt to) - hide any packages that would be refused. + Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. <literal>nix-env -qa</literal> will (attempt to) hide any packages that would be refused. </para> <para> Each of these criteria can be altered in the nixpkgs configuration. </para> <para> - The nixpkgs configuration for a NixOS system is set in the - <literal>configuration.nix</literal>, as in the following example: + The nixpkgs configuration for a NixOS system is set in the <literal>configuration.nix</literal>, as in the following example: <programlisting> { nixpkgs.config = { @@ -53,13 +42,10 @@ }; } </programlisting> - However, this does not allow unfree software for individual users. Their - configurations are managed separately. + However, this does not allow unfree software for individual users. Their configurations are managed separately. </para> <para> - A user's of nixpkgs configuration is stored in a user-specific configuration - file located at <filename>~/.config/nixpkgs/config.nix</filename>. For - example: + A user's of nixpkgs configuration is stored in a user-specific configuration file located at <filename>~/.config/nixpkgs/config.nix</filename>. For example: <programlisting> { allowUnfree = true; @@ -67,31 +53,25 @@ </programlisting> </para> <para> - Note that we are not able to test or build unfree software on Hydra due to - policy. Most unfree licenses prohibit us from either executing or - distributing the software. + Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software. </para> <section xml:id="sec-allow-broken"> <title>Installing broken packages</title> <para> - There are two ways to try compiling a package which has been marked as - broken. + There are two ways to try compiling a package which has been marked as broken. </para> <itemizedlist> <listitem> <para> - For allowing the build of a broken package once, you can use an - environment variable for a single invocation of the nix tools: + For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting> </para> </listitem> <listitem> <para> - For permanently allowing broken packages to be built, you may add - <literal>allowBroken = true;</literal> to your user's configuration file, - like this: + For permanently allowing broken packages to be built, you may add <literal>allowBroken = true;</literal> to your user's configuration file, like this: <programlisting> { allowBroken = true; @@ -105,23 +85,19 @@ <title>Installing packages on unsupported systems</title> <para> - There are also two ways to try compiling a package which has been marked as - unsuported for the given system. + There are also two ways to try compiling a package which has been marked as unsuported for the given system. </para> <itemizedlist> <listitem> <para> - For allowing the build of a broken package once, you can use an - environment variable for a single invocation of the nix tools: + For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: <programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting> </para> </listitem> <listitem> <para> - For permanently allowing broken packages to be built, you may add - <literal>allowUnsupportedSystem = true;</literal> to your user's - configuration file, like this: + For permanently allowing broken packages to be built, you may add <literal>allowUnsupportedSystem = true;</literal> to your user's configuration file, like this: <programlisting> { allowUnsupportedSystem = true; @@ -132,42 +108,29 @@ </itemizedlist> <para> - The difference between a package being unsupported on some system and being - broken is admittedly a bit fuzzy. If a program <emphasis>ought</emphasis> to - work on a certain platform, but doesn't, the platform should be included in - <literal>meta.platforms</literal>, but marked as broken with e.g. - <literal>meta.broken = !hostPlatform.isWindows</literal>. Of course, this - begs the question of what "ought" means exactly. That is left to the package - maintainer. + The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the platform should be included in <literal>meta.platforms</literal>, but marked as broken with e.g. <literal>meta.broken = !hostPlatform.isWindows</literal>. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer. </para> </section> <section xml:id="sec-allow-unfree"> <title>Installing unfree packages</title> <para> - There are several ways to tweak how Nix handles a package which has been - marked as unfree. + There are several ways to tweak how Nix handles a package which has been marked as unfree. </para> <itemizedlist> <listitem> <para> - To temporarily allow all unfree packages, you can use an environment - variable for a single invocation of the nix tools: + To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting> </para> </listitem> <listitem> <para> - It is possible to permanently allow individual unfree packages, while - still blocking unfree packages by default using the - <literal>allowUnfreePredicate</literal> configuration option in the user - configuration file. + It is possible to permanently allow individual unfree packages, while still blocking unfree packages by default using the <literal>allowUnfreePredicate</literal> configuration option in the user configuration file. </para> <para> - This option is a function which accepts a package as a parameter, and - returns a boolean. The following example configuration accepts a package - and always returns false: + This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false: <programlisting> { allowUnfreePredicate = (pkg: false); @@ -175,8 +138,7 @@ </programlisting> </para> <para> - For a more useful example, try the following. This configuration only - allows unfree packages named flash player and visual studio code: + For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code: <programlisting> { allowUnfreePredicate = (pkg: builtins.elem @@ -190,14 +152,10 @@ </listitem> <listitem> <para> - It is also possible to whitelist and blacklist licenses that are - specifically acceptable or not acceptable, using - <literal>whitelistedLicenses</literal> and - <literal>blacklistedLicenses</literal>, respectively. + It is also possible to whitelist and blacklist licenses that are specifically acceptable or not acceptable, using <literal>whitelistedLicenses</literal> and <literal>blacklistedLicenses</literal>, respectively. </para> <para> - The following example configuration whitelists the licenses - <literal>amd</literal> and <literal>wtfpl</literal>: + The following example configuration whitelists the licenses <literal>amd</literal> and <literal>wtfpl</literal>: <programlisting> { whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; @@ -205,8 +163,7 @@ </programlisting> </para> <para> - The following example configuration blacklists the <literal>gpl3</literal> - and <literal>agpl3</literal> licenses: + The following example configuration blacklists the <literal>gpl3</literal> and <literal>agpl3</literal> licenses: <programlisting> { blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; @@ -217,37 +174,29 @@ </itemizedlist> <para> - A complete list of licenses can be found in the file - <filename>lib/licenses.nix</filename> of the nixpkgs tree. + A complete list of licenses can be found in the file <filename>lib/licenses.nix</filename> of the nixpkgs tree. </para> </section> <section xml:id="sec-allow-insecure"> <title>Installing insecure packages</title> <para> - There are several ways to tweak how Nix handles a package which has been - marked as insecure. + There are several ways to tweak how Nix handles a package which has been marked as insecure. </para> <itemizedlist> <listitem> <para> - To temporarily allow all insecure packages, you can use an environment - variable for a single invocation of the nix tools: + To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting> </para> </listitem> <listitem> <para> - It is possible to permanently allow individual insecure packages, while - still blocking other insecure packages by default using the - <literal>permittedInsecurePackages</literal> configuration option in the - user configuration file. + It is possible to permanently allow individual insecure packages, while still blocking other insecure packages by default using the <literal>permittedInsecurePackages</literal> configuration option in the user configuration file. </para> <para> - The following example configuration permits the installation of the - hypothetically insecure package <literal>hello</literal>, version - <literal>1.2.3</literal>: + The following example configuration permits the installation of the hypothetically insecure package <literal>hello</literal>, version <literal>1.2.3</literal>: <programlisting> { permittedInsecurePackages = [ @@ -259,18 +208,13 @@ </listitem> <listitem> <para> - It is also possible to create a custom policy around which insecure - packages to allow and deny, by overriding the - <literal>allowInsecurePredicate</literal> configuration option. + It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the <literal>allowInsecurePredicate</literal> configuration option. </para> <para> - The <literal>allowInsecurePredicate</literal> option is a function which - accepts a package and returns a boolean, much like - <literal>allowUnfreePredicate</literal>. + The <literal>allowInsecurePredicate</literal> option is a function which accepts a package and returns a boolean, much like <literal>allowUnfreePredicate</literal>. </para> <para> - The following configuration example only allows insecure packages with - very short names: + The following configuration example only allows insecure packages with very short names: <programlisting> { allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) <= 5); @@ -278,8 +222,7 @@ </programlisting> </para> <para> - Note that <literal>permittedInsecurePackages</literal> is only checked if - <literal>allowInsecurePredicate</literal> is not specified. + Note that <literal>permittedInsecurePackages</literal> is only checked if <literal>allowInsecurePredicate</literal> is not specified. </para> </listitem> </itemizedlist> @@ -289,10 +232,7 @@ <title>Modify packages via <literal>packageOverrides</literal></title> <para> - You can define a function called <varname>packageOverrides</varname> in your - local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix - packages. It must be a function that takes pkgs as an argument and returns a - modified set of packages. + You can define a function called <varname>packageOverrides</varname> in your local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages. <programlisting> { packageOverrides = pkgs: rec { @@ -309,15 +249,7 @@ <title>Build an environment</title> <para> - Using <literal>packageOverrides</literal>, it is possible to manage - packages declaratively. This means that we can list all of our desired - packages within a declarative Nix expression. For example, to have - <literal>aspell</literal>, <literal>bc</literal>, - <literal>ffmpeg</literal>, <literal>coreutils</literal>, - <literal>gdb</literal>, <literal>nixUnstable</literal>, - <literal>emscripten</literal>, <literal>jq</literal>, - <literal>nox</literal>, and <literal>silver-searcher</literal>, we could - use the following in <filename>~/.config/nixpkgs/config.nix</filename>: + Using <literal>packageOverrides</literal>, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have <literal>aspell</literal>, <literal>bc</literal>, <literal>ffmpeg</literal>, <literal>coreutils</literal>, <literal>gdb</literal>, <literal>nixUnstable</literal>, <literal>emscripten</literal>, <literal>jq</literal>, <literal>nox</literal>, and <literal>silver-searcher</literal>, we could use the following in <filename>~/.config/nixpkgs/config.nix</filename>: </para> <screen> @@ -343,13 +275,7 @@ </screen> <para> - To install it into our environment, you can just run <literal>nix-env -iA - nixpkgs.myPackages</literal>. If you want to load the packages to be built - from a working copy of <literal>nixpkgs</literal> you just run - <literal>nix-env -f. -iA myPackages</literal>. To explore what's been - installed, just look through <filename>~/.nix-profile/</filename>. You can - see that a lot of stuff has been installed. Some of this stuff is useful - some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + To install it into our environment, you can just run <literal>nix-env -iA nixpkgs.myPackages</literal>. If you want to load the packages to be built from a working copy of <literal>nixpkgs</literal> you just run <literal>nix-env -f. -iA myPackages</literal>. To explore what's been installed, just look through <filename>~/.nix-profile/</filename>. You can see that a lot of stuff has been installed. Some of this stuff is useful some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: </para> <screen> @@ -376,12 +302,7 @@ </screen> <para> - <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed - which gets rid of the extra stuff in the profile. <filename>/bin</filename> - and <filename>/share</filename> are good defaults for a user environment, - getting rid of the clutter. If you are running on Nix on MacOS, you may - want to add another path as well, <filename>/Applications</filename>, that - makes GUI apps available. + <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed which gets rid of the extra stuff in the profile. <filename>/bin</filename> and <filename>/share</filename> are good defaults for a user environment, getting rid of the clutter. If you are running on Nix on MacOS, you may want to add another path as well, <filename>/Applications</filename>, that makes GUI apps available. </para> </section> @@ -389,13 +310,7 @@ <title>Getting documentation</title> <para> - After building that new environment, look through - <filename>~/.nix-profile</filename> to make sure everything is there that - we wanted. Discerning readers will note that some files are missing. Look - inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this. - There are no man pages for any of the Nix tools! This is because some - packages like Nix have multiple outputs for things like documentation (see - section 4). Let's make Nix install those as well. + After building that new environment, look through <filename>~/.nix-profile</filename> to make sure everything is there that we wanted. Discerning readers will note that some files are missing. Look inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this. There are no man pages for any of the Nix tools! This is because some packages like Nix have multiple outputs for things like documentation (see section 4). Let's make Nix install those as well. </para> <screen> @@ -422,9 +337,7 @@ </screen> <para> - This provides us with some useful documentation for using our packages. - However, if we actually want those manpages to be detected by man, we need - to set up our environment. This can also be managed within Nix expressions. + This provides us with some useful documentation for using our packages. However, if we actually want those manpages to be detected by man, we need to set up our environment. This can also be managed within Nix expressions. </para> <screen> @@ -460,9 +373,7 @@ </screen> <para> - For this to work fully, you must also have this script sourced when you are - logged in. Try adding something like this to your - <filename>~/.profile</filename> file: + For this to work fully, you must also have this script sourced when you are logged in. Try adding something like this to your <filename>~/.profile</filename> file: </para> <screen> @@ -477,8 +388,7 @@ fi </screen> <para> - Now just run <literal>source $HOME/.profile</literal> and you can starting - loading man pages from your environent. + Now just run <literal>source $HOME/.profile</literal> and you can starting loading man pages from your environent. </para> </section> @@ -486,9 +396,7 @@ fi <title>GNU info setup</title> <para> - Configuring GNU info is a little bit trickier than man pages. To work - correctly, info needs a database to be generated. This can be done with - some small modifications to our environment scripts. + Configuring GNU info is a little bit trickier than man pages. To work correctly, info needs a database to be generated. This can be done with some small modifications to our environment scripts. </para> <screen> @@ -534,11 +442,7 @@ fi </screen> <para> - <literal>postBuild</literal> tells Nixpkgs to run a command after building - the environment. In this case, <literal>install-info</literal> adds the - installed info pages to <literal>dir</literal> which is GNU info's default - root node. Note that <literal>texinfoInteractive</literal> is added to the - environment to give the <literal>install-info</literal> command. + <literal>postBuild</literal> tells Nixpkgs to run a command after building the environment. In this case, <literal>install-info</literal> adds the installed info pages to <literal>dir</literal> which is GNU info's default root node. Note that <literal>texinfoInteractive</literal> is added to the environment to give the <literal>install-info</literal> command. </para> </section> </section> diff --git a/doc/contributing.xml b/doc/contributing.xml index 523c1c9c8f0..b0266043775 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -3,10 +3,8 @@ xml:id="chap-contributing"> <title>Contributing to this documentation</title> <para> - The DocBook sources of the Nixpkgs manual are in the - <filename -xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> - subdirectory of the Nixpkgs repository. + The DocBook sources of the Nixpkgs manual are in the <filename +xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> subdirectory of the Nixpkgs repository. </para> <para> You can quickly check your edits with <command>make</command>: @@ -17,19 +15,16 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> <prompt>[nix-shell]$ </prompt>make </screen> <para> - If you experience problems, run <command>make debug</command> to help - understand the docbook errors. + If you experience problems, run <command>make debug</command> to help understand the docbook errors. </para> <para> - After making modifications to the manual, it's important to build it before - committing. You can do that as follows: + After making modifications to the manual, it's important to build it before committing. You can do that as follows: <screen> <prompt>$ </prompt>cd /path/to/nixpkgs/doc <prompt>$ </prompt>nix-shell <prompt>[nix-shell]$ </prompt>make clean <prompt>[nix-shell]$ </prompt>nix-build . </screen> - If the build succeeds, the manual will be in - <filename>./result/share/doc/nixpkgs/manual.html</filename>. + If the build succeeds, the manual will be in <filename>./result/share/doc/nixpkgs/manual.html</filename>. </para> </chapter> diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index d212706e171..93fe9095ce2 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -6,25 +6,11 @@ <title>Introduction</title> <para> - "Cross-compilation" means compiling a program on one machine for another - type of machine. For example, a typical use of cross-compilation is to - compile programs for embedded devices. These devices often don't have the - computing power and memory to compile their own programs. One might think - that cross-compilation is a fairly niche concern. However, there are - significant advantages to rigorously distinguishing between build-time and - run-time environments! Significant, because the benefits apply even when one - is developing and deploying on the same machine. Nixpkgs is increasingly - adopting the opinion that packages should be written with cross-compilation - in mind, and nixpkgs should evaluate in a similar way (by minimizing - cross-compilation-specific special cases) whether or not one is - cross-compiling. + "Cross-compilation" means compiling a program on one machine for another type of machine. For example, a typical use of cross-compilation is to compile programs for embedded devices. These devices often don't have the computing power and memory to compile their own programs. One might think that cross-compilation is a fairly niche concern. However, there are significant advantages to rigorously distinguishing between build-time and run-time environments! Significant, because the benefits apply even when one is developing and deploying on the same machine. Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling. </para> <para> - This chapter will be organized in three parts. First, it will describe the - basics of how to package software in a way that supports cross-compilation. - Second, it will describe how to use Nixpkgs when cross-compiling. Third, it - will describe the internal infrastructure supporting cross-compilation. + This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation. </para> </section> <!--============================================================--> @@ -35,24 +21,12 @@ <title>Platform parameters</title> <para> - Nixpkgs follows the - <link - xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions - of GNU autoconf</link>. We distinguish between 3 types of platforms when - building a derivation: <wordasword>build</wordasword>, - <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In - summary, <wordasword>build</wordasword> is the platform on which a package - is being built, <wordasword>host</wordasword> is the platform on which it - will run. The third attribute, <wordasword>target</wordasword>, is relevant - only for certain specific compilers and build tools. + Nixpkgs follows the <link + xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions of GNU autoconf</link>. We distinguish between 3 types of platforms when building a derivation: <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In summary, <wordasword>build</wordasword> is the platform on which a package is being built, <wordasword>host</wordasword> is the platform on which it will run. The third attribute, <wordasword>target</wordasword>, is relevant only for certain specific compilers and build tools. </para> <para> - In Nixpkgs, these three platforms are defined as attribute sets under the - names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, - and <literal>targetPlatform</literal>. They are always defined as - attributes in the standard environment. That means one can access them - like: + In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>. They are always defined as attributes in the standard environment. That means one can access them like: <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting> . </para> @@ -64,9 +38,7 @@ </term> <listitem> <para> - The "build platform" is the platform on which a package is built. Once - someone has a built package, or pre-built binary package, the build - platform should not matter and can be ignored. + The "build platform" is the platform on which a package is built. Once someone has a built package, or pre-built binary package, the build platform should not matter and can be ignored. </para> </listitem> </varlistentry> @@ -76,9 +48,7 @@ </term> <listitem> <para> - The "host platform" is the platform on which a package will be run. This - is the simplest platform to understand, but also the one with the worst - name. + The "host platform" is the platform on which a package will be run. This is the simplest platform to understand, but also the one with the worst name. </para> </listitem> </varlistentry> @@ -88,44 +58,23 @@ </term> <listitem> <para> - The "target platform" attribute is, unlike the other two attributes, not - actually fundamental to the process of building software. Instead, it is - only relevant for compatibility with building certain specific compilers - and build tools. It can be safely ignored for all other packages. + The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages. </para> <para> - The build process of certain compilers is written in such a way that the - compiler resulting from a single build can itself only produce binaries - for a single platform. The task of specifying this single "target - platform" is thus pushed to build time of the compiler. The root cause - of this is that the compiler (which will be run on the host) and the - standard library/runtime (which will be run on the target) are built by - a single build process. + The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. The task of specifying this single "target platform" is thus pushed to build time of the compiler. The root cause of this is that the compiler (which will be run on the host) and the standard library/runtime (which will be run on the target) are built by a single build process. </para> <para> - There is no fundamental need to think about a single target ahead of - time like this. If the tool supports modular or pluggable backends, both - the need to specify the target at build time and the constraint of - having only a single target disappear. An example of such a tool is - LLVM. + There is no fundamental need to think about a single target ahead of time like this. If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. An example of such a tool is LLVM. </para> <para> - Although the existence of a "target platfom" is arguably a historical - mistake, it is a common one: examples of tools that suffer from it are - GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the - mistake where possible. Still, because the concept of a target platform - is so ingrained, it is best to support it as is. + Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is. </para> </listitem> </varlistentry> </variablelist> <para> - The exact schema these fields follow is a bit ill-defined due to a long and - convoluted evolution, but this is slowly being cleaned up. You can see - examples of ones used in practice in - <literal>lib.systems.examples</literal>; note how they are not all very - consistent. For now, here are few fields can count on them containing: + The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent. For now, here are few fields can count on them containing: </para> <variablelist> @@ -135,13 +84,7 @@ </term> <listitem> <para> - This is a two-component shorthand for the platform. Examples of this - would be "x86_64-darwin" and "i686-linux"; see - <literal>lib.systems.doubles</literal> for more. The first component - corresponds to the CPU architecture of the platform and the second to - the operating system of the platform (<literal>[cpu]-[os]</literal>). - This format has built-in support in Nix, such as the - <varname>builtins.currentSystem</varname> impure string. + This is a two-component shorthand for the platform. Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform (<literal>[cpu]-[os]</literal>). This format has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string. </para> </listitem> </varlistentry> @@ -151,15 +94,7 @@ </term> <listitem> <para> - This is a 3- or 4- component shorthand for the platform. Examples of - this would be <literal>x86_64-unknown-linux-gnu</literal> and - <literal>aarch64-apple-darwin14</literal>. This is a standard format - called the "LLVM target triple", as they are pioneered by LLVM. In the - 4-part form, this corresponds to - <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly - more informative than the "Nix host double", as the previous format - could analogously be termed. This needs a better name than - <varname>config</varname>! + This is a 3- or 4- component shorthand for the platform. Examples of this would be <literal>x86_64-unknown-linux-gnu</literal> and <literal>aarch64-apple-darwin14</literal>. This is a standard format called the "LLVM target triple", as they are pioneered by LLVM. In the 4-part form, this corresponds to <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. This needs a better name than <varname>config</varname>! </para> </listitem> </varlistentry> @@ -169,10 +104,7 @@ </term> <listitem> <para> - This is a Nix representation of a parsed LLVM target triple with - white-listed components. This can be specified directly, or actually - parsed from the <varname>config</varname>. See - <literal>lib.systems.parse</literal> for the exact representation. + This is a Nix representation of a parsed LLVM target triple with white-listed components. This can be specified directly, or actually parsed from the <varname>config</varname>. See <literal>lib.systems.parse</literal> for the exact representation. </para> </listitem> </varlistentry> @@ -182,10 +114,7 @@ </term> <listitem> <para> - This is a string identifying the standard C library used. Valid - identifiers include "glibc" for GNU libc, "libSystem" for Darwin's - Libsystem, and "uclibc" for µClibc. It should probably be refactored to - use the module system, like <varname>parse</varname>. + This is a string identifying the standard C library used. Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. It should probably be refactored to use the module system, like <varname>parse</varname>. </para> </listitem> </varlistentry> @@ -195,10 +124,7 @@ </term> <listitem> <para> - These predicates are defined in <literal>lib.systems.inspect</literal>, - and slapped onto every platform. They are superior to the ones in - <varname>stdenv</varname> as they force the user to be explicit about - which platform they are inspecting. Please use these instead of those. + These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped onto every platform. They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting. Please use these instead of those. </para> </listitem> </varlistentry> @@ -208,11 +134,7 @@ </term> <listitem> <para> - This is, quite frankly, a dumping ground of ad-hoc settings (it's an - attribute set). See <literal>lib.systems.platforms</literal> for - examples—there's hopefully one in there that will work verbatim for - each platform that is working. Please help us triage these flags and - give them better homes! + This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working. Please help us triage these flags and give them better homes! </para> </listitem> </varlistentry> @@ -224,62 +146,33 @@ <note> <para> - This is a rather philosophical description that isn't very - Nixpkgs-specific. For an overview of all the relevant attributes given to - <varname>mkDerivation</varname>, see - <xref - linkend="ssec-stdenv-dependencies"/>. For a description of how - everything is implemented, see - <xref linkend="ssec-cross-dependency-implementation" />. + This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to <varname>mkDerivation</varname>, see <xref + linkend="ssec-stdenv-dependencies"/>. For a description of how everything is implemented, see <xref linkend="ssec-cross-dependency-implementation" />. </para> </note> <para> - In this section we explore the relationship between both runtime and - build-time dependencies and the 3 Autoconf platforms. + In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms. </para> <para> - A run time dependency between two packages requires that their host - platforms match. This is directly implied by the meaning of "host platform" - and "runtime dependency": The package dependency exists while both packages - are running on a single host platform. + A run time dependency between two packages requires that their host platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": The package dependency exists while both packages are running on a single host platform. </para> <para> - A build time dependency, however, has a shift in platforms between the - depending package and the depended-on package. "build time dependency" - means that to build the depending package we need to be able to run the - depended-on's package. The depending package's build platform is therefore - equal to the depended-on package's host platform. + A build time dependency, however, has a shift in platforms between the depending package and the depended-on package. "build time dependency" means that to build the depending package we need to be able to run the depended-on's package. The depending package's build platform is therefore equal to the depended-on package's host platform. </para> <para> - If both the dependency and depending packages aren't compilers or other - machine-code-producing tools, we're done. And indeed - <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> - have covered these simpler build-time and run-time (respectively) changes - for many years. But if the dependency does produce machine code, we might - need to worry about its target platform too. In principle, that target - platform might be any of the depending package's build, host, or target - platforms, but we prohibit dependencies from a "later" platform to an - earlier platform to limit confusion because we've never seen a legitimate - use for them. + If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> have covered these simpler build-time and run-time (respectively) changes for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them. </para> <para> - Finally, if the depending package is a compiler or other - machine-code-producing tool, it might need dependencies that run at "emit - time". This is for compilers that (regrettably) insist on being built - together with their source langauges' standard libraries. Assuming build != - host != target, a run-time dependency of the standard library cannot be run - at the compiler's build time or run time, but only at the run time of code - emitted by the compiler. + Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source langauges' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler. </para> <para> - Putting this all together, that means we have dependencies in the form - "host → target", in at most the following six combinations: + Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations: <table> <caption>Possible dependency types</caption> <thead> @@ -318,16 +211,7 @@ </para> <para> - Some examples will make this table clearer. Suppose there's some package - that is being built with a <literal>(build, host, target)</literal> - platform triple of <literal>(foo, bar, baz)</literal>. If it has a - build-time library dependency, that would be a "host → build" dependency - with a triple of <literal>(foo, foo, *)</literal> (the target platform is - irrelevant). If it needs a compiler to be built, that would be a "build → - host" dependency with a triple of <literal>(foo, foo, *)</literal> (the - target platform is irrelevant). That compiler, would be built with another - compiler, also "build → host" dependency, with a triple of <literal>(foo, - foo, foo)</literal>. + Some examples will make this table clearer. Suppose there's some package that is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, baz)</literal>. If it has a build-time library dependency, that would be a "host → build" dependency with a triple of <literal>(foo, foo, *)</literal> (the target platform is irrelevant). If it needs a compiler to be built, that would be a "build → host" dependency with a triple of <literal>(foo, foo, *)</literal> (the target platform is irrelevant). That compiler, would be built with another compiler, also "build → host" dependency, with a triple of <literal>(foo, foo, foo)</literal>. </para> </section> @@ -335,20 +219,14 @@ <title>Cross packaging cookbook</title> <para> - Some frequently encountered problems when packaging for cross-compilation - should be answered here. Ideally, the information above is exhaustive, so - this section cannot provide any new information, but it is ludicrous and - cruel to expect everyone to spend effort working through the interaction of - many features just to figure out the same answer to the same common - problem. Feel free to add to this list! + Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list! </para> <qandaset> <qandaentry xml:id="cross-qa-build-c-program-in-build-environment"> <question> <para> - What if my package's build system needs to build a C program to be run - under the build environment? + What if my package's build system needs to build a C program to be run under the build environment? </para> </question> <answer> @@ -366,11 +244,7 @@ </question> <answer> <para> - Many packages assume that an unprefixed <command>ar</command> is - available, but Nix doesn't provide one. It only provides a prefixed one, - just as it only does for all the other binutils programs. It may be - necessary to patch the package to fix the build system to use a prefixed - `ar`. + Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`. </para> </answer> </qandaentry> @@ -395,82 +269,32 @@ <title>Cross-building packages</title> <para> - Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in - which case there is no cross-compiling and everything is built by and for - that system, or also with <varname>crossSystem</varname>, in which case - packages run on the latter, but all building happens on the former. Both - parameters take the same schema as the 3 (build, host, and target) platforms - defined in the previous section. As mentioned above, - <literal>lib.systems.examples</literal> has some platforms which are used as - arguments for these parameters in practice. You can use them - programmatically, or on the command line: + Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross-compiling and everything is built by and for that system, or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line: <programlisting> -nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever</programlisting> +nix-build '<nixpkgs>' --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever</programlisting> </para> <note> <para> - Eventually we would like to make these platform examples an unnecessary - convenience so that + Eventually we would like to make these platform examples an unnecessary convenience so that <programlisting> -nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os>-<vendor>-<abi>"; }' -A whatever</programlisting> - works in the vast majority of cases. The problem today is dependencies on - other sorts of configuration which aren't given proper defaults. We rely on - the examples to crudely to set those configuration parameters in some - vaguely sane manner on the users behalf. Issue - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> - tracks this inconvenience along with its root cause in crufty configuration - options. +nix-build '<nixpkgs>' --arg crossSystem '{ config = "<arch>-<os>-<vendor>-<abi>"; }' -A whatever</programlisting> + works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options. </para> </note> <para> - While one is free to pass both parameters in full, there's a lot of logic to - fill in missing fields. As discussed in the previous section, only one of - <varname>system</varname>, <varname>config</varname>, and - <varname>parsed</varname> is needed to infer the other two. Additionally, - <varname>libc</varname> will be inferred from <varname>parse</varname>. - Finally, <literal>localSystem.system</literal> is also - <emphasis>impurely</emphasis> inferred based on the platform evaluation - occurs. This means it is often not necessary to pass - <varname>localSystem</varname> at all, as in the command-line example in the - previous paragraph. + While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two. Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>. Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs. This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph. </para> <note> <para> - Many sources (manual, wiki, etc) probably mention passing - <varname>system</varname>, <varname>platform</varname>, along with the - optional <varname>crossSystem</varname> to nixpkgs: <literal>import - <nixpkgs> { system = ..; platform = ..; crossSystem = ..; - }</literal>. Passing those two instead of <varname>localSystem</varname> is - still supported for compatibility, but is discouraged. Indeed, much of the - inference we do for these parameters is motivated by compatibility as much - as convenience. + Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs: <literal>import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }</literal>. Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. </para> </note> <para> - One would think that <varname>localSystem</varname> and - <varname>crossSystem</varname> overlap horribly with the three - <varname>*Platforms</varname> (<varname>buildPlatform</varname>, - <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see - <varname>stage.nix</varname> or the manual). Actually, those identifiers are - purposefully not used here to draw a subtle but important distinction: While - the granularity of having 3 platforms is necessary to properly *build* - packages, it is overkill for specifying the user's *intent* when making a - build plan or package set. A simple "build vs deploy" dichotomy is adequate: - the sliding window principle described in the previous section shows how to - interpolate between the these two "end points" to get the 3 platform triple - for each bootstrapping stage. That means for any package a given package - set, even those not bound on the top level but only reachable via - dependencies or <varname>buildPackages</varname>, the three platforms will - be defined as one of <varname>localSystem</varname> or - <varname>crossSystem</varname>, with the former replacing the latter as one - traverses build-time dependencies. A last simple difference is that - <varname>crossSystem</varname> should be null when one doesn't want to - cross-compile, while the <varname>*Platform</varname>s are always non-null. - <varname>localSystem</varname> is always non-null. + One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual). Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies. A last simple difference is that <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null. <varname>localSystem</varname> is always non-null. </para> </section> <!--============================================================--> @@ -481,61 +305,20 @@ nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os> <title>Implementation of dependencies</title> <para> - The categorizes of dependencies developed in - <xref - linkend="ssec-cross-dependency-categorization"/> are specified as - lists of derivations given to <varname>mkDerivation</varname>, as - documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each - list of dependencies for "host → target" of "foo → bar" is called - <varname>depsFooBar</varname>, with exceptions for backwards compatibility - that <varname>depsBuildHost</varname> is instead called - <varname>nativeBuildInputs</varname> and <varname>depsHostTarget</varname> - is instead called <varname>buildInputs</varname>. Nixpkgs is now structured - so that each <varname>depsFooBar</varname> is automatically taken from - <varname>pkgsFooBar</varname>. (These <varname>pkgsFooBar</varname>s are - quite new, so there is no special case for - <varname>nativeBuildInputs</varname> and <varname>buildInputs</varname>.) - For example, <varname>pkgsBuildHost.gcc</varname> should be used at - build-time, while <varname>pkgsHostTarget.gcc</varname> should be used at - run-time. + The categorizes of dependencies developed in <xref + linkend="ssec-cross-dependency-categorization"/> are specified as lists of derivations given to <varname>mkDerivation</varname>, as documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each list of dependencies for "host → target" of "foo → bar" is called <varname>depsFooBar</varname>, with exceptions for backwards compatibility that <varname>depsBuildHost</varname> is instead called <varname>nativeBuildInputs</varname> and <varname>depsHostTarget</varname> is instead called <varname>buildInputs</varname>. Nixpkgs is now structured so that each <varname>depsFooBar</varname> is automatically taken from <varname>pkgsFooBar</varname>. (These <varname>pkgsFooBar</varname>s are quite new, so there is no special case for <varname>nativeBuildInputs</varname> and <varname>buildInputs</varname>.) For example, <varname>pkgsBuildHost.gcc</varname> should be used at build-time, while <varname>pkgsHostTarget.gcc</varname> should be used at run-time. </para> <para> - Now, for most of Nixpkgs's history, there were no - <varname>pkgsFooBar</varname> attributes, and most packages have not been - refactored to use it explicitly. Prior to those, there were just - <varname>buildPackages</varname>, <varname>pkgs</varname>, and - <varname>targetPackages</varname>. Those are now redefined as aliases to - <varname>pkgsBuildHost</varname>, <varname>pkgsHostTarget</varname>, and - <varname>pkgsTargetTarget</varname>. It is acceptable, even recommended, to - use them for libraries to show that the host platform is irrelevant. + Now, for most of Nixpkgs's history, there were no <varname>pkgsFooBar</varname> attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just <varname>buildPackages</varname>, <varname>pkgs</varname>, and <varname>targetPackages</varname>. Those are now redefined as aliases to <varname>pkgsBuildHost</varname>, <varname>pkgsHostTarget</varname>, and <varname>pkgsTargetTarget</varname>. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant. </para> <para> - But before that, there was just <varname>pkgs</varname>, even though both - <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> - existed. [Cross barely worked, and those were implemented with some hacks - on <varname>mkDerivation</varname> to override dependencies.] What this - means is the vast majority of packages do not use any explicit package set - to populate their dependencies, just using whatever - <varname>callPackage</varname> gives them even if they do correctly sort - their dependencies into the multiple lists described above. And indeed, - asking that users both sort their dependencies, <emphasis>and</emphasis> - take them from the right attribute set, is both too onerous and redundant, - so the recommended approach (for now) is to continue just categorizing by - list and not using an explicit package set. + But before that, there was just <varname>pkgs</varname>, even though both <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname> existed. [Cross barely worked, and those were implemented with some hacks on <varname>mkDerivation</varname> to override dependencies.] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever <varname>callPackage</varname> gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, <emphasis>and</emphasis> take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set. </para> <para> - To make this work, we "splice" together the six - <varname>pkgsFooBar</varname> package sets and have - <varname>callPackage</varname> actually take its arguments from that. This - is currently implemented in <filename>pkgs/top-level/splice.nix</filename>. - <varname>mkDerivation</varname> then, for each dependency attribute, pulls - the right derivation out from the splice. This splicing can be skipped when - not cross-compiling as the package sets are the same, but still is a bit - slow for cross-compiling. We'd like to do something better, but haven't - come up with anything yet. + To make this work, we "splice" together the six <varname>pkgsFooBar</varname> package sets and have <varname>callPackage</varname> actually take its arguments from that. This is currently implemented in <filename>pkgs/top-level/splice.nix</filename>. <varname>mkDerivation</varname> then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet. </para> </section> @@ -543,21 +326,11 @@ nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os> <title>Bootstrapping</title> <para> - Each of the package sets described above come from a single bootstrapping - stage. While <filename>pkgs/top-level/default.nix</filename>, coordinates - the composition of stages at a high level, - <filename>pkgs/top-level/stage.nix</filename> "ties the knot" (creates the - fixed point) of each stage. The package sets are defined per-stage however, - so they can be thought of as edges between stages (the nodes) in a graph. - Compositions like <literal>pkgsBuildTarget.targetPackages</literal> can be - thought of as paths to this graph. + Each of the package sets described above come from a single bootstrapping stage. While <filename>pkgs/top-level/default.nix</filename>, coordinates the composition of stages at a high level, <filename>pkgs/top-level/stage.nix</filename> "ties the knot" (creates the fixed point) of each stage. The package sets are defined per-stage however, so they can be thought of as edges between stages (the nodes) in a graph. Compositions like <literal>pkgsBuildTarget.targetPackages</literal> can be thought of as paths to this graph. </para> <para> - While there are many package sets, and thus many edges, the stages can also - be arranged in a linear chain. In other words, many of the edges are - redundant as far as connectivity is concerned. This hinges on the type of - bootstrapping we do. Currently for cross it is: + While there are many package sets, and thus many edges, the stages can also be arranged in a linear chain. In other words, many of the edges are redundant as far as connectivity is concerned. This hinges on the type of bootstrapping we do. Currently for cross it is: <orderedlist> <listitem> <para> @@ -575,102 +348,45 @@ nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os> </para> </listitem> </orderedlist> - In each stage, <varname>pkgsBuildHost</varname> refers the the previous - stage, <varname>pkgsBuildBuild</varname> refers to the one before that, and - <varname>pkgsHostTarget</varname> refers to the current one, and - <varname>pkgsTargetTarget</varname> refers to the next one. When there is - no previous or next stage, they instead refer to the current stage. Note - how all the invariants regarding the mapping between dependency and - depending packages' build host and target platforms are preserved. - <varname>pkgsBuildTarget</varname> and <varname>pkgsHostHost</varname> are - more complex in that the stage fitting the requirements isn't always a - fixed chain of "prevs" and "nexts" away (modulo the "saturating" - self-references at the ends). We just special case each instead. All the - primary edges are implemented is in - <filename>pkgs/stdenv/booter.nix</filename>, and secondarily aliases in - <filename>pkgs/top-level/stage.nix</filename>. + In each stage, <varname>pkgsBuildHost</varname> refers the the previous stage, <varname>pkgsBuildBuild</varname> refers to the one before that, and <varname>pkgsHostTarget</varname> refers to the current one, and <varname>pkgsTargetTarget</varname> refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. <varname>pkgsBuildTarget</varname> and <varname>pkgsHostHost</varname> are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in <filename>pkgs/stdenv/booter.nix</filename>, and secondarily aliases in <filename>pkgs/top-level/stage.nix</filename>. </para> <note> <para> - Note the native stages are bootstrapped in legacy ways that predate the - current cross implementation. This is why the the bootstrapping stages - leading up to the final stages are ignored inthe previous paragraph. + Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph. </para> </note> <para> - If one looks at the 3 platform triples, one can see that they overlap such - that one could put them together into a chain like: + If one looks at the 3 platform triples, one can see that they overlap such that one could put them together into a chain like: <programlisting> (native, native, native, foreign, foreign) </programlisting> - If one imagines the saturating self references at the end being replaced - with infinite stages, and then overlays those platform triples, one ends up - with the infinite tuple: + If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple: <programlisting> (native..., native, native, native, foreign, foreign, foreign...) </programlisting> - On can then imagine any sequence of platforms such that there are bootstrap - stages with their 3 platforms determined by "sliding a window" that is the - 3 tuple through the sequence. This was the original model for - bootstrapping. Without a target platform (assume a better world where all - compilers are multi-target and all standard libraries are built in their - own derivation), this is sufficient. Conversely if one wishes to cross - compile "faster", with a "Canadian Cross" bootstraping stage where - <literal>build != host != target</literal>, more bootstrapping stages are - needed since no sliding window providess the pesky - <varname>pkgsBuildTarget</varname> package set since it skips the Canadian - cross stage's "host". + On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstraping stage where <literal>build != host != target</literal>, more bootstrapping stages are needed since no sliding window providess the pesky <varname>pkgsBuildTarget</varname> package set since it skips the Canadian cross stage's "host". </para> <note> <para> - It is much better to refer to <varname>buildPackages</varname> than - <varname>targetPackages</varname>, or more broadly package sets that do - not mention "target". There are three reasons for this. + It is much better to refer to <varname>buildPackages</varname> than <varname>targetPackages</varname>, or more broadly package sets that do not mention "target". There are three reasons for this. </para> <para> - First, it is because bootstrapping stages do not have a unique - <varname>targetPackages</varname>. For example a <literal>(x86-linux, - x86-linux, arm-linux)</literal> and <literal>(x86-linux, x86-linux, - x86-windows)</literal> package set both have a <literal>(x86-linux, - x86-linux, x86-linux)</literal> package set. Because there is no canonical - <varname>targetPackages</varname> for such a native (<literal>build == - host == target</literal>) package set, we set their - <varname>targetPackages</varname> + First, it is because bootstrapping stages do not have a unique <varname>targetPackages</varname>. For example a <literal>(x86-linux, x86-linux, arm-linux)</literal> and <literal>(x86-linux, x86-linux, x86-windows)</literal> package set both have a <literal>(x86-linux, x86-linux, x86-linux)</literal> package set. Because there is no canonical <varname>targetPackages</varname> for such a native (<literal>build == host == target</literal>) package set, we set their <varname>targetPackages</varname> </para> <para> - Second, it is because this is a frequent source of hard-to-follow - "infinite recursions" / cycles. When only package sets that don't mention - target are used, the package set forms a directed acyclic graph. This - means that all cycles that exist are confined to one stage. This means - they are a lot smaller, and easier to follow in the code or a backtrace. - It also means they are present in native and cross builds alike, and so - more likely to be caught by CI and other users. + Second, it is because this is a frequent source of hard-to-follow "infinite recursions" / cycles. When only package sets that don't mention target are used, the package set forms a directed acyclic graph. This means that all cycles that exist are confined to one stage. This means they are a lot smaller, and easier to follow in the code or a backtrace. It also means they are present in native and cross builds alike, and so more likely to be caught by CI and other users. </para> <para> - Thirdly, it is because everything target-mentioning only exists to - accommodate compilers with lousy build systems that insist on the compiler - itself and standard library being built together. Of course that is bad - because bigger derivations means longer rebuilds. It is also problematic - because it tends to make the standard libraries less like other libraries - than they could be, complicating code and build systems alike. Because of - the other problems, and because of these innate disadvantages, compilers - ought to be packaged another way where possible. + Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible. </para> </note> <note> <para> - If one explores Nixpkgs, they will see derivations with names like - <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is - a holdover from before we properly distinguished between the host and - target platforms—the derivation with "Cross" in the name covered the - <literal>build = host != target</literal> case, while the other covered - the <literal>host = target</literal>, with build platform the same or not - based on whether one was using its <literal>.nativeDrv</literal> or - <literal>.crossDrv</literal>. This ugliness will disappear soon. + If one explores Nixpkgs, they will see derivations with names like <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>. This ugliness will disappear soon. </para> </note> </section> diff --git a/doc/functions.xml b/doc/functions.xml index 96bd95958ea..3e126e6b139 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -4,8 +4,7 @@ xml:id="chap-functions"> <title>Functions reference</title> <para> - The nixpkgs repository has several utility functions to manipulate Nix - expressions. + The nixpkgs repository has several utility functions to manipulate Nix expressions. </para> <xi:include href="functions/library.xml" /> <xi:include href="functions/overrides.xml" /> diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml index e6dbc22f48d..37e4251cda2 100644 --- a/doc/functions/appimagetools.xml +++ b/doc/functions/appimagetools.xml @@ -5,17 +5,12 @@ <title>pkgs.appimageTools</title> <para> - <varname>pkgs.appimageTools</varname> is a set of functions for extracting - and wrapping <link xlink:href="https://appimage.org/">AppImage</link> files. - They are meant to be used if traditional packaging from source is infeasible, - or it would take too long. To quickly run an AppImage file, - <literal>pkgs.appimage-run</literal> can be used as well. + <varname>pkgs.appimageTools</varname> is a set of functions for extracting and wrapping <link xlink:href="https://appimage.org/">AppImage</link> files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, <literal>pkgs.appimage-run</literal> can be used as well. </para> <warning> <para> - The <varname>appimageTools</varname> API is unstable and may be subject to - backwards-incompatible changes in the future. + The <varname>appimageTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future. </para> </warning> @@ -23,9 +18,7 @@ <title>AppImage formats</title> <para> - There are different formats for AppImages, see - <link xlink:href="https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format">the - specification</link> for details. + There are different formats for AppImages, see <link xlink:href="https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format">the specification</link> for details. </para> <itemizedlist> @@ -55,8 +48,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x) </screen> <para> - Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM - filesystem</literal>, and the type 2 AppImage is not. + Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM filesystem</literal>, and the type 2 AppImage is not. </para> </section> @@ -64,8 +56,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x) <title>Wrapping</title> <para> - Depending on the type of AppImage you're wrapping, you'll have to use - <varname>wrapType1</varname> or <varname>wrapType2</varname>. + Depending on the type of AppImage you're wrapping, you'll have to use <varname>wrapType1</varname> or <varname>wrapType2</varname>. </para> <programlisting> @@ -91,23 +82,16 @@ appimageTools.wrapType2 { # or wrapType1 </callout> <callout arearefs='ex-appimageTools-wrapping-2'> <para> - <varname>extraPkgs</varname> allows you to pass a function to include - additional packages inside the FHS environment your AppImage is going to - run in. There are a few ways to learn which dependencies an application - needs: + <varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: <itemizedlist> <listitem> <para> - Looking through the extracted AppImage files, reading its scripts and - running <command>patchelf</command> and <command>ldd</command> on its - executables. This can also be done in <command>appimage-run</command>, - by setting <command>APPIMAGE_DEBUG_EXEC=bash</command>. + Looking through the extracted AppImage files, reading its scripts and running <command>patchelf</command> and <command>ldd</command> on its executables. This can also be done in <command>appimage-run</command>, by setting <command>APPIMAGE_DEBUG_EXEC=bash</command>. </para> </listitem> <listitem> <para> - Running <command>strace -vfefile</command> on the wrapped executable, - looking for libraries that can't be found. + Running <command>strace -vfefile</command> on the wrapped executable, looking for libraries that can't be found. </para> </listitem> </itemizedlist> diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml index c6b3611eea5..c27421f12e7 100644 --- a/doc/functions/debug.xml +++ b/doc/functions/debug.xml @@ -5,17 +5,10 @@ <title>Debugging Nix Expressions</title> <para> - Nix is a unityped, dynamic language, this means every value can potentially - appear anywhere. Since it is also non-strict, evaluation order and what - ultimately is evaluated might surprise you. Therefore it is important to be - able to debug nix expressions. + Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. </para> <para> - In the <literal>lib/debug.nix</literal> file you will find a number of - functions that help (pretty-)printing values while evaluation is runnnig. You - can even specify how deep these values should be printed recursively, and - transform them on the fly. Please consult the docstrings in - <literal>lib/debug.nix</literal> for usage information. + In the <literal>lib/debug.nix</literal> file you will find a number of functions that help (pretty-)printing values while evaluation is runnnig. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in <literal>lib/debug.nix</literal> for usage information. </para> </section> diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index 6b293a2e778..2243453c3e9 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -5,17 +5,12 @@ <title>pkgs.dockerTools</title> <para> - <varname>pkgs.dockerTools</varname> is a set of functions for creating and - manipulating Docker images according to the - <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120"> - Docker Image Specification v1.2.0 </link>. Docker itself is not used to - perform any of the operations done by these functions. + <varname>pkgs.dockerTools</varname> is a set of functions for creating and manipulating Docker images according to the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120"> Docker Image Specification v1.2.0 </link>. Docker itself is not used to perform any of the operations done by these functions. </para> <warning> <para> - The <varname>dockerTools</varname> API is unstable and may be subject to - backwards-incompatible changes in the future. + The <varname>dockerTools</varname> API is unstable and may be subject to backwards-incompatible changes in the future. </para> </warning> @@ -23,15 +18,11 @@ <title>buildImage</title> <para> - This function is analogous to the <command>docker build</command> command, - in that it can be used to build a Docker-compatible repository tarball - containing a single image with one or multiple layers. As such, the result - is suitable for being loaded in Docker with <command>docker load</command>. + This function is analogous to the <command>docker build</command> command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with <command>docker load</command>. </para> <para> - The parameters of <varname>buildImage</varname> with relative example values - are described below: + The parameters of <varname>buildImage</varname> with relative example values are described below: </para> <example xml:id='ex-dockerTools-buildImage'> @@ -63,135 +54,89 @@ buildImage { </example> <para> - The above example will build a Docker image <literal>redis/latest</literal> - from the given base image. Loading and running this image in Docker results - in <literal>redis-server</literal> being started automatically. + The above example will build a Docker image <literal>redis/latest</literal> from the given base image. Loading and running this image in Docker results in <literal>redis-server</literal> being started automatically. </para> <calloutlist> <callout arearefs='ex-dockerTools-buildImage-1'> <para> - <varname>name</varname> specifies the name of the resulting image. This is - the only required argument for <varname>buildImage</varname>. + <varname>name</varname> specifies the name of the resulting image. This is the only required argument for <varname>buildImage</varname>. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-2'> <para> - <varname>tag</varname> specifies the tag of the resulting image. By - default it's <literal>null</literal>, which indicates that the nix output - hash will be used as tag. + <varname>tag</varname> specifies the tag of the resulting image. By default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-3'> <para> - <varname>fromImage</varname> is the repository tarball containing the base - image. It must be a valid Docker image, such as exported by - <command>docker save</command>. By default it's <literal>null</literal>, - which can be seen as equivalent to <literal>FROM scratch</literal> of a - <filename>Dockerfile</filename>. + <varname>fromImage</varname> is the repository tarball containing the base image. It must be a valid Docker image, such as exported by <command>docker save</command>. By default it's <literal>null</literal>, which can be seen as equivalent to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-4'> <para> - <varname>fromImageName</varname> can be used to further specify the base - image within the repository, in case it contains multiple images. By - default it's <literal>null</literal>, in which case - <varname>buildImage</varname> will peek the first image available in the - repository. + <varname>fromImageName</varname> can be used to further specify the base image within the repository, in case it contains multiple images. By default it's <literal>null</literal>, in which case <varname>buildImage</varname> will peek the first image available in the repository. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-5'> <para> - <varname>fromImageTag</varname> can be used to further specify the tag of - the base image within the repository, in case an image contains multiple - tags. By default it's <literal>null</literal>, in which case - <varname>buildImage</varname> will peek the first tag available for the - base image. + <varname>fromImageTag</varname> can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's <literal>null</literal>, in which case <varname>buildImage</varname> will peek the first tag available for the base image. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-6'> <para> - <varname>contents</varname> is a derivation that will be copied in the new - layer of the resulting image. This can be similarly seen as <command>ADD - contents/ /</command> in a <filename>Dockerfile</filename>. By default - it's <literal>null</literal>. + <varname>contents</varname> is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>. By default it's <literal>null</literal>. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-runAsRoot'> <para> - <varname>runAsRoot</varname> is a bash script that will run as root in an - environment that overlays the existing layers of the base image with the - new resulting layer, including the previously copied - <varname>contents</varname> derivation. This can be similarly seen as - <command>RUN ...</command> in a <filename>Dockerfile</filename>. + <varname>runAsRoot</varname> is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied <varname>contents</varname> derivation. This can be similarly seen as <command>RUN ...</command> in a <filename>Dockerfile</filename>. <note> <para> - Using this parameter requires the <literal>kvm</literal> device to be - available. + Using this parameter requires the <literal>kvm</literal> device to be available. </para> </note> </para> </callout> <callout arearefs='ex-dockerTools-buildImage-8'> <para> - <varname>config</varname> is used to specify the configuration of the - containers that will be started off the built image in Docker. The - available options are listed in the - <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> - Docker Image Specification v1.2.0 </link>. + <varname>config</varname> is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> Docker Image Specification v1.2.0 </link>. </para> </callout> </calloutlist> <para> - After the new layer has been created, its closure (to which - <varname>contents</varname>, <varname>config</varname> and - <varname>runAsRoot</varname> contribute) will be copied in the layer itself. - Only new dependencies that are not already in the existing layers will be - copied. + After the new layer has been created, its closure (to which <varname>contents</varname>, <varname>config</varname> and <varname>runAsRoot</varname> contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. </para> <para> - At the end of the process, only one new single layer will be produced and - added to the resulting image. + At the end of the process, only one new single layer will be produced and added to the resulting image. </para> <para> - The resulting repository will only list the single image - <varname>image/tag</varname>. In the case of - <xref linkend='ex-dockerTools-buildImage'/> it would be - <varname>redis/latest</varname>. + The resulting repository will only list the single image <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/> it would be <varname>redis/latest</varname>. </para> <para> - It is possible to inspect the arguments with which an image was built using - its <varname>buildArgs</varname> attribute. + It is possible to inspect the arguments with which an image was built using its <varname>buildArgs</varname> attribute. </para> <note> <para> - If you see errors similar to <literal>getProtocolByName: does not exist (no - such protocol name: tcp)</literal> you may need to add - <literal>pkgs.iana-etc</literal> to <varname>contents</varname>. + If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal> you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>. </para> </note> <note> <para> - If you see errors similar to <literal>Error_Protocol ("certificate has - unknown CA",True,UnknownCa)</literal> you may need to add - <literal>pkgs.cacert</literal> to <varname>contents</varname>. + If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal> you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>. </para> </note> <example xml:id="example-pkgs-dockerTools-buildImage-creation-date"> <title>Impurely Defining a Docker Layer's Creation Date</title> <para> - By default <function>buildImage</function> will use a static date of one - second past the UNIX Epoch. This allows <function>buildImage</function> to - produce binary reproducible images. When listing images with - <command>docker images</command>, the newly created images will be listed - like this: + By default <function>buildImage</function> will use a static date of one second past the UNIX Epoch. This allows <function>buildImage</function> to produce binary reproducible images. When listing images with <command>docker images</command>, the newly created images will be listed like this: </para> <screen><![CDATA[ $ docker images @@ -199,9 +144,7 @@ REPOSITORY TAG IMAGE ID CREATED SIZE hello latest 08c791c7846e 48 years ago 25.2MB ]]></screen> <para> - You can break binary reproducibility but have a sorted, meaningful - <literal>CREATED</literal> column by setting <literal>created</literal> to - <literal>now</literal>. + You can break binary reproducibility but have a sorted, meaningful <literal>CREATED</literal> column by setting <literal>created</literal> to <literal>now</literal>. </para> <programlisting><![CDATA[ pkgs.dockerTools.buildImage { @@ -214,8 +157,7 @@ pkgs.dockerTools.buildImage { } ]]></programlisting> <para> - and now the Docker CLI will display a reasonable date and sort the images - as expected: + and now the Docker CLI will display a reasonable date and sort the images as expected: <screen><![CDATA[ $ docker images REPOSITORY TAG IMAGE ID CREATED SIZE @@ -230,8 +172,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB <title>buildLayeredImage</title> <para> - Create a Docker image with many of the store paths being on their own layer - to improve sharing between images. + Create a Docker image with many of the store paths being on their own layer to improve sharing between images. </para> <variablelist> @@ -264,8 +205,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB </term> <listitem> <para> - Top level paths in the container. Either a single derivation, or a list - of derivations. + Top level paths in the container. Either a single derivation, or a list of derivations. </para> <para> <emphasis>Default:</emphasis> <literal>[]</literal> @@ -278,10 +218,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB </term> <listitem> <para> - Run-time configuration of the container. A full list of the options are - available at in the - <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> - Docker Image Specification v1.2.0 </link>. + Run-time configuration of the container. A full list of the options are available at in the <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> Docker Image Specification v1.2.0 </link>. </para> <para> <emphasis>Default:</emphasis> <literal>{}</literal> @@ -294,9 +231,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB </term> <listitem> <para> - Date and time the layers were created. Follows the same - <literal>now</literal> exception supported by - <literal>buildImage</literal>. + Date and time the layers were created. Follows the same <literal>now</literal> exception supported by <literal>buildImage</literal>. </para> <para> <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal> @@ -325,9 +260,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB </term> <listitem> <para> - Shell commands to run while building the final layer, without access to - most of the layer contents. Changes to this layer are "on top" of all the - other layers, so can create additional directories and files. + Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files. </para> </listitem> </varlistentry> @@ -337,8 +270,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB <title>Behavior of <varname>contents</varname> in the final image</title> <para> - Each path directly listed in <varname>contents</varname> will have a - symlink in the root of the image. + Each path directly listed in <varname>contents</varname> will have a symlink in the root of the image. </para> <para> @@ -349,8 +281,7 @@ pkgs.dockerTools.buildLayeredImage { contents = [ pkgs.hello ]; } ]]></programlisting> - will create symlinks for all the paths in the <literal>hello</literal> - package: + will create symlinks for all the paths in the <literal>hello</literal> package: <screen><![CDATA[ /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info @@ -363,13 +294,11 @@ pkgs.dockerTools.buildLayeredImage { <title>Automatic inclusion of <varname>config</varname> references</title> <para> - The closure of <varname>config</varname> is automatically included in the - closure of the final image. + The closure of <varname>config</varname> is automatically included in the closure of the final image. </para> <para> - This allows you to make very simple Docker images with very little code. - This container will start up and run <command>hello</command>: + This allows you to make very simple Docker images with very little code. This container will start up and run <command>hello</command>: <programlisting><![CDATA[ pkgs.dockerTools.buildLayeredImage { name = "hello"; @@ -383,31 +312,23 @@ pkgs.dockerTools.buildLayeredImage { <title>Adjusting <varname>maxLayers</varname></title> <para> - Increasing the <varname>maxLayers</varname> increases the number of layers - which have a chance to be shared between different images. + Increasing the <varname>maxLayers</varname> increases the number of layers which have a chance to be shared between different images. </para> <para> - Modern Docker installations support up to 128 layers, however older - versions support as few as 42. + Modern Docker installations support up to 128 layers, however older versions support as few as 42. </para> <para> - If the produced image will not be extended by other Docker builds, it is - safe to set <varname>maxLayers</varname> to <literal>128</literal>. However - it will be impossible to extend the image further. + If the produced image will not be extended by other Docker builds, it is safe to set <varname>maxLayers</varname> to <literal>128</literal>. However it will be impossible to extend the image further. </para> <para> - The first (<literal>maxLayers-2</literal>) most "popular" paths will have - their own individual layers, then layer #<literal>maxLayers-1</literal> - will contain all the remaining "unpopular" paths, and finally layer - #<literal>maxLayers</literal> will contain the Image configuration. + The first (<literal>maxLayers-2</literal>) most "popular" paths will have their own individual layers, then layer #<literal>maxLayers-1</literal> will contain all the remaining "unpopular" paths, and finally layer #<literal>maxLayers</literal> will contain the Image configuration. </para> <para> - Docker's Layers are not inherently ordered, they are content-addressable - and are not explicitly layered until they are composed in to an Image. + Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. </para> </section> </section> @@ -416,10 +337,7 @@ pkgs.dockerTools.buildLayeredImage { <title>pullImage</title> <para> - This function is analogous to the <command>docker pull</command> command, in - that it can be used to pull a Docker image from a Docker registry. By - default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used - to pull images. + This function is analogous to the <command>docker pull</command> command, in that it can be used to pull a Docker image from a Docker registry. By default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used to pull images. </para> <para> @@ -444,71 +362,51 @@ pullImage { <calloutlist> <callout arearefs='ex-dockerTools-pullImage-1'> <para> - <varname>imageName</varname> specifies the name of the image to be - downloaded, which can also include the registry namespace (e.g. - <literal>nixos</literal>). This argument is required. + <varname>imageName</varname> specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. <literal>nixos</literal>). This argument is required. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-2'> <para> - <varname>imageDigest</varname> specifies the digest of the image to be - downloaded. This argument is required. + <varname>imageDigest</varname> specifies the digest of the image to be downloaded. This argument is required. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-3'> <para> - <varname>finalImageName</varname>, if specified, this is the name of the - image to be created. Note it is never used to fetch the image since we - prefer to rely on the immutable digest ID. By default it's equal to - <varname>imageName</varname>. + <varname>finalImageName</varname>, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to <varname>imageName</varname>. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-4'> <para> - <varname>finalImageTag</varname>, if specified, this is the tag of the - image to be created. Note it is never used to fetch the image since we - prefer to rely on the immutable digest ID. By default it's - <literal>latest</literal>. + <varname>finalImageTag</varname>, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's <literal>latest</literal>. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-5'> <para> - <varname>sha256</varname> is the checksum of the whole fetched image. This - argument is required. + <varname>sha256</varname> is the checksum of the whole fetched image. This argument is required. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-6'> <para> - <varname>os</varname>, if specified, is the operating system of the - fetched image. By default it's <literal>linux</literal>. + <varname>os</varname>, if specified, is the operating system of the fetched image. By default it's <literal>linux</literal>. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-7'> <para> - <varname>arch</varname>, if specified, is the cpu architecture of the - fetched image. By default it's <literal>x86_64</literal>. + <varname>arch</varname>, if specified, is the cpu architecture of the fetched image. By default it's <literal>x86_64</literal>. </para> </callout> </calloutlist> <para> - <literal>nix-prefetch-docker</literal> command can be used to get required - image parameters: + <literal>nix-prefetch-docker</literal> command can be used to get required image parameters: <screen> <prompt>$ </prompt>nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 </screen> - Since a given <varname>imageName</varname> may transparently refer to a - manifest list of images which support multiple architectures and/or - operating systems, you can supply the <option>--os</option> and - <option>--arch</option> arguments to specify exactly which image you want. - By default it will match the OS and architecture of the host the command is - run on. + Since a given <varname>imageName</varname> may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the <option>--os</option> and <option>--arch</option> arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on. <screen> <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux </screen> - Desired image name and tag can be set using - <option>--final-image-name</option> and <option>--final-image-tag</option> - arguments: + Desired image name and tag can be set using <option>--final-image-name</option> and <option>--final-image-tag</option> arguments: <screen> <prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod </screen> @@ -519,17 +417,12 @@ pullImage { <title>exportImage</title> <para> - This function is analogous to the <command>docker export</command> command, - in that it can be used to flatten a Docker image that contains multiple - layers. It is in fact the result of the merge of all the layers of the - image. As such, the result is suitable for being imported in Docker with - <command>docker import</command>. + This function is analogous to the <command>docker export</command> command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with <command>docker import</command>. </para> <note> <para> - Using this function requires the <literal>kvm</literal> device to be - available. + Using this function requires the <literal>kvm</literal> device to be available. </para> </note> @@ -551,14 +444,11 @@ exportImage { </example> <para> - The parameters relative to the base image have the same synopsis as - described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that - <varname>fromImage</varname> is the only required argument in this case. + The parameters relative to the base image have the same synopsis as described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that <varname>fromImage</varname> is the only required argument in this case. </para> <para> - The <varname>name</varname> argument is the name of the derivation output, - which defaults to <varname>fromImage.name</varname>. + The <varname>name</varname> argument is the name of the derivation output, which defaults to <varname>fromImage.name</varname>. </para> </section> @@ -566,11 +456,7 @@ exportImage { <title>shadowSetup</title> <para> - This constant string is a helper for setting up the base files for managing - users and groups, only if such files don't exist already. It is suitable for - being used in a <varname>runAsRoot</varname> - <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like - in the example below: + This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like in the example below: </para> <example xml:id='ex-dockerTools-shadowSetup'> @@ -592,9 +478,7 @@ buildImage { </example> <para> - Creating base files like <literal>/etc/passwd</literal> or - <literal>/etc/login.defs</literal> is necessary for shadow-utils to - manipulate users and groups. + Creating base files like <literal>/etc/passwd</literal> or <literal>/etc/login.defs</literal> is necessary for shadow-utils to manipulate users and groups. </para> </section> </section> diff --git a/doc/functions/fetchers.xml b/doc/functions/fetchers.xml index a736008c9d4..369c1fb153e 100644 --- a/doc/functions/fetchers.xml +++ b/doc/functions/fetchers.xml @@ -5,18 +5,11 @@ <title>Fetcher functions</title> <para> - When using Nix, you will frequently need to download source code and other - files from the internet. Nixpkgs comes with a few helper functions that allow - you to fetch fixed-output derivations in a structured way. + When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way. </para> <para> - The two fetcher primitives are <function>fetchurl</function> and - <function>fetchzip</function>. Both of these have two required arguments, a - URL and a hash. The hash is typically <literal>sha256</literal>, although - many more hash algorithms are supported. Nixpkgs contributors are currently - recommended to use <literal>sha256</literal>. This hash will be used by Nix - to identify your source. A typical usage of fetchurl is provided below. + The two fetcher primitives are <function>fetchurl</function> and <function>fetchzip</function>. Both of these have two required arguments, a URL and a hash. The hash is typically <literal>sha256</literal>, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use <literal>sha256</literal>. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below. </para> <programlisting><![CDATA[ @@ -32,30 +25,15 @@ stdenv.mkDerivation { ]]></programlisting> <para> - The main difference between <function>fetchurl</function> and - <function>fetchzip</function> is in how they store the contents. - <function>fetchurl</function> will store the unaltered contents of the URL - within the Nix store. <function>fetchzip</function> on the other hand will - decompress the archive for you, making files and directories directly - accessible in the future. <function>fetchzip</function> can only be used with - archives. Despite the name, <function>fetchzip</function> is not limited to - .zip files and can also be used with any tarball. + The main difference between <function>fetchurl</function> and <function>fetchzip</function> is in how they store the contents. <function>fetchurl</function> will store the unaltered contents of the URL within the Nix store. <function>fetchzip</function> on the other hand will decompress the archive for you, making files and directories directly accessible in the future. <function>fetchzip</function> can only be used with archives. Despite the name, <function>fetchzip</function> is not limited to .zip files and can also be used with any tarball. </para> <para> - <function>fetchpatch</function> works very similarly to - <function>fetchurl</function> with the same arguments expected. It expects - patch files as a source and and performs normalization on them before - computing the checksum. For example it will remove comments or other unstable - parts that are sometimes added by version control systems and can change over - time. + <function>fetchpatch</function> works very similarly to <function>fetchurl</function> with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. </para> <para> - Other fetcher functions allow you to add source code directly from a VCS such - as subversion or git. These are mostly straightforward names based on the - name of the command used with the VCS system. Because they give you a working - repository, they act most like <function>fetchzip</function>. + Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward names based on the name of the command used with the VCS system. Because they give you a working repository, they act most like <function>fetchzip</function>. </para> <variablelist> @@ -65,8 +43,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - Used with Subversion. Expects <literal>url</literal> to a Subversion - directory, <literal>rev</literal>, and <literal>sha256</literal>. + Used with Subversion. Expects <literal>url</literal> to a Subversion directory, <literal>rev</literal>, and <literal>sha256</literal>. </para> </listitem> </varlistentry> @@ -76,10 +53,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - Used with Git. Expects <literal>url</literal> to a Git repo, - <literal>rev</literal>, and <literal>sha256</literal>. - <literal>rev</literal> in this case can be full the git commit id (SHA1 - hash) or a tag name like <literal>refs/tags/v1.0</literal>. + Used with Git. Expects <literal>url</literal> to a Git repo, <literal>rev</literal>, and <literal>sha256</literal>. <literal>rev</literal> in this case can be full the git commit id (SHA1 hash) or a tag name like <literal>refs/tags/v1.0</literal>. </para> </listitem> </varlistentry> @@ -89,8 +63,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - Used with Fossil. Expects <literal>url</literal> to a Fossil archive, - <literal>rev</literal>, and <literal>sha256</literal>. + Used with Fossil. Expects <literal>url</literal> to a Fossil archive, <literal>rev</literal>, and <literal>sha256</literal>. </para> </listitem> </varlistentry> @@ -100,8 +73,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - Used with CVS. Expects <literal>cvsRoot</literal>, <literal>tag</literal>, - and <literal>sha256</literal>. + Used with CVS. Expects <literal>cvsRoot</literal>, <literal>tag</literal>, and <literal>sha256</literal>. </para> </listitem> </varlistentry> @@ -111,18 +83,14 @@ stdenv.mkDerivation { </term> <listitem> <para> - Used with Mercurial. Expects <literal>url</literal>, - <literal>rev</literal>, and <literal>sha256</literal>. + Used with Mercurial. Expects <literal>url</literal>, <literal>rev</literal>, and <literal>sha256</literal>. </para> </listitem> </varlistentry> </variablelist> <para> - A number of fetcher functions wrap part of <function>fetchurl</function> and - <function>fetchzip</function>. They are mainly convenience functions intended - for commonly used destinations of source code in Nixpkgs. These wrapper - fetchers are listed below. + A number of fetcher functions wrap part of <function>fetchurl</function> and <function>fetchzip</function>. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below. </para> <variablelist> @@ -132,17 +100,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - <function>fetchFromGitHub</function> expects four arguments. - <literal>owner</literal> is a string corresponding to the GitHub user or - organization that controls this repository. <literal>repo</literal> - corresponds to the name of the software repository. These are located at - the top of every GitHub HTML page as - <literal>owner</literal>/<literal>repo</literal>. <literal>rev</literal> - corresponds to the Git commit hash or tag (e.g <literal>v1.0</literal>) - that will be downloaded from Git. Finally, <literal>sha256</literal> - corresponds to the hash of the extracted directory. Again, other hash - algorithms are also available but <literal>sha256</literal> is currently - preferred. + <function>fetchFromGitHub</function> expects four arguments. <literal>owner</literal> is a string corresponding to the GitHub user or organization that controls this repository. <literal>repo</literal> corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as <literal>owner</literal>/<literal>repo</literal>. <literal>rev</literal> corresponds to the Git commit hash or tag (e.g <literal>v1.0</literal>) that will be downloaded from Git. Finally, <literal>sha256</literal> corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but <literal>sha256</literal> is currently preferred. </para> </listitem> </varlistentry> @@ -152,8 +110,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - This is used with GitLab repositories. The arguments expected are very - similar to fetchFromGitHub above. + This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above. </para> </listitem> </varlistentry> @@ -163,8 +120,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - This is used with BitBucket repositories. The arguments expected are very - similar to fetchFromGitHub above. + This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above. </para> </listitem> </varlistentry> @@ -174,8 +130,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - This is used with Savannah repositories. The arguments expected are very - similar to fetchFromGitHub above. + This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above. </para> </listitem> </varlistentry> @@ -185,8 +140,7 @@ stdenv.mkDerivation { </term> <listitem> <para> - This is used with repo.or.cz repositories. The arguments expected are very - similar to fetchFromGitHub above. + This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above. </para> </listitem> </varlistentry> diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml index 79682080be3..e7b81e97a23 100644 --- a/doc/functions/fhs-environments.xml +++ b/doc/functions/fhs-environments.xml @@ -5,15 +5,7 @@ <title>buildFHSUserEnv</title> <para> - <function>buildFHSUserEnv</function> provides a way to build and run - FHS-compatible lightweight sandboxes. It creates an isolated root with bound - <filename>/nix/store</filename>, so its footprint in terms of disk space - needed is quite small. This allows one to run software which is hard or - unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, - games distributed as tarballs, software with integrity checking and/or - external self-updated binaries. It uses Linux namespaces feature to create - temporary lightweight environments which are destroyed after all child - processes exit, without root user rights requirement. Accepted arguments are: + <function>buildFHSUserEnv</function> provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound <filename>/nix/store</filename>, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are: </para> <variablelist> @@ -33,8 +25,7 @@ </term> <listitem> <para> - Packages to be installed for the main host's architecture (i.e. x86_64 on - x86_64 installations). Along with libraries binaries are also installed. + Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed. </para> </listitem> </varlistentry> @@ -44,9 +35,7 @@ </term> <listitem> <para> - Packages to be installed for all architectures supported by a host (i.e. - i686 and x86_64 on x86_64 installations). Only libraries are installed by - default. + Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default. </para> </listitem> </varlistentry> @@ -66,8 +55,7 @@ </term> <listitem> <para> - Like <literal>extraBuildCommands</literal>, but executed only on multilib - architectures. + Like <literal>extraBuildCommands</literal>, but executed only on multilib architectures. </para> </listitem> </varlistentry> @@ -77,8 +65,7 @@ </term> <listitem> <para> - Additional derivation outputs to be linked for both target and - multi-architecture packages. + Additional derivation outputs to be linked for both target and multi-architecture packages. </para> </listitem> </varlistentry> @@ -88,8 +75,7 @@ </term> <listitem> <para> - Additional commands to be executed for finalizing the derivation with - runner script. + Additional commands to be executed for finalizing the derivation with runner script. </para> </listitem> </varlistentry> @@ -99,16 +85,14 @@ </term> <listitem> <para> - A command that would be executed inside the sandbox and passed all the - command line arguments. It defaults to <literal>bash</literal>. + A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to <literal>bash</literal>. </para> </listitem> </varlistentry> </variablelist> <para> - One can create a simple environment using a <literal>shell.nix</literal> like - that: + One can create a simple environment using a <literal>shell.nix</literal> like that: </para> <programlisting><![CDATA[ @@ -133,10 +117,6 @@ ]]></programlisting> <para> - Running <literal>nix-shell</literal> would then drop you into a shell with - these libraries and binaries available. You can use this to run closed-source - applications which expect FHS structure without hassles: simply change - <literal>runScript</literal> to the application path, e.g. - <filename>./bin/start.sh</filename> -- relative paths are supported. + Running <literal>nix-shell</literal> would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change <literal>runScript</literal> to the application path, e.g. <filename>./bin/start.sh</filename> -- relative paths are supported. </para> </section> diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml index e860b10e897..9ce1f85eb17 100644 --- a/doc/functions/generators.xml +++ b/doc/functions/generators.xml @@ -5,28 +5,15 @@ <title>Generators</title> <para> - Generators are functions that create file formats from nix data structures, - e. g. for configuration files. There are generators available for: - <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal> + Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal> </para> <para> - All generators follow a similar call interface: <code>generatorName - configFunctions data</code>, where <literal>configFunctions</literal> is an - attrset of user-defined functions that format nested parts of the content. - They each have common defaults, so often they do not need to be set manually. - An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ] - name)</code> from the <literal>INI</literal> generator. It receives the name - of a section and sanitizes it. The default <literal>mkSectionName</literal> - escapes <literal>[</literal> and <literal>]</literal> with a backslash. + All generators follow a similar call interface: <code>generatorName configFunctions data</code>, where <literal>configFunctions</literal> is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ] name)</code> from the <literal>INI</literal> generator. It receives the name of a section and sanitizes it. The default <literal>mkSectionName</literal> escapes <literal>[</literal> and <literal>]</literal> with a backslash. </para> <para> - Generators can be fine-tuned to produce exactly the file format required by - your application/service. One example is an INI-file format which uses - <literal>: </literal> as separator, the strings - <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and - requires all string values to be quoted: + Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses <literal>: </literal> as separator, the strings <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and requires all string values to be quoted: </para> <programlisting> @@ -77,13 +64,11 @@ merge:"diff3" <note> <para> - Nix store paths can be converted to strings by enclosing a derivation - attribute like so: <code>"${drv}"</code>. + Nix store paths can be converted to strings by enclosing a derivation attribute like so: <code>"${drv}"</code>. </para> </note> <para> - Detailed documentation for each generator can be found in - <literal>lib/generators.nix</literal>. + Detailed documentation for each generator can be found in <literal>lib/generators.nix</literal>. </para> </section> diff --git a/doc/functions/library.xml b/doc/functions/library.xml index e6aedaa6efd..6ffb944b5a6 100644 --- a/doc/functions/library.xml +++ b/doc/functions/library.xml @@ -5,8 +5,7 @@ <title>Nixpkgs Library Functions</title> <para> - Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or - through <code>import <nixpkgs/lib></code>. + Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or through <code>import <nixpkgs/lib></code>. </para> <xi:include href="./library/asserts.xml" /> diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml index 437850e408b..10891039e86 100644 --- a/doc/functions/library/asserts.xml +++ b/doc/functions/library/asserts.xml @@ -27,8 +27,7 @@ </term> <listitem> <para> - Condition under which the <varname>msg</varname> should - <emphasis>not</emphasis> be printed. + Condition under which the <varname>msg</varname> should <emphasis>not</emphasis> be printed. </para> </listitem> </varlistentry> @@ -64,9 +63,7 @@ stderr> assert failed <xi:include href="./locations.xml" xpointer="lib.asserts.assertOneOf" /> <para> - Specialized <function>asserts.assertMsg</function> for checking if - <varname>val</varname> is one of the elements of <varname>xs</varname>. - Useful for checking enums. + Specialized <function>asserts.assertMsg</function> for checking if <varname>val</varname> is one of the elements of <varname>xs</varname>. Useful for checking enums. </para> <variablelist> @@ -76,8 +73,7 @@ stderr> assert failed </term> <listitem> <para> - The name of the variable the user entered <varname>val</varname> into, - for inclusion in the error message. + The name of the variable the user entered <varname>val</varname> into, for inclusion in the error message. </para> </listitem> </varlistentry> @@ -87,8 +83,7 @@ stderr> assert failed </term> <listitem> <para> - The value of what the user provided, to be compared against the values in - <varname>xs</varname>. + The value of what the user provided, to be compared against the values in <varname>xs</varname>. </para> </listitem> </varlistentry> diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 65d0b40e2e8..f9234069392 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -23,8 +23,7 @@ </term> <listitem> <para> - A list of strings representing the path through the nested attribute set - <varname>set</varname>. + A list of strings representing the path through the nested attribute set <varname>set</varname>. </para> </listitem> </varlistentry> @@ -34,8 +33,7 @@ </term> <listitem> <para> - Default value if <varname>attrPath</varname> does not resolve to an - existing value. + Default value if <varname>attrPath</varname> does not resolve to an existing value. </para> </listitem> </varlistentry> @@ -88,8 +86,7 @@ lib.attrsets.attrByPath [ "a" "b" ] 0 {} </term> <listitem> <para> - A list of strings representing the path through the nested attribute set - <varname>set</varname>. + A list of strings representing the path through the nested attribute set <varname>set</varname>. </para> </listitem> </varlistentry> @@ -125,8 +122,7 @@ lib.attrsets.hasAttrByPath <xi:include href="./locations.xml" xpointer="lib.attrsets.setAttrByPath" /> <para> - Create a new attribute set with <varname>value</varname> set at the nested - attribute location specified in <varname>attrPath</varname>. + Create a new attribute set with <varname>value</varname> set at the nested attribute location specified in <varname>attrPath</varname>. </para> <variablelist> @@ -146,8 +142,7 @@ lib.attrsets.hasAttrByPath </term> <listitem> <para> - The value to set at the location described by - <varname>attrPath</varname>. + The value to set at the location described by <varname>attrPath</varname>. </para> </listitem> </varlistentry> @@ -171,8 +166,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3 <xi:include href="./locations.xml" xpointer="lib.attrsets.getAttrFromPath" /> <para> - Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except - without a default, and it will throw if the value doesn't exist. + Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except without a default, and it will throw if the value doesn't exist. </para> <variablelist> @@ -182,8 +176,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3 </term> <listitem> <para> - A list of strings representing the path through the nested attribute set - <varname>set</varname>. + A list of strings representing the path through the nested attribute set <varname>set</varname>. </para> </listitem> </varlistentry> @@ -235,8 +228,7 @@ lib.attrsets.getAttrFromPath [ "x" "y" ] { } </term> <listitem> <para> - The list of attributes to fetch from <varname>set</varname>. Each - attribute name must exist on the attrbitue set. + The list of attributes to fetch from <varname>set</varname>. Each attribute name must exist on the attrbitue set. </para> </listitem> </varlistentry> @@ -282,8 +274,7 @@ error: attribute 'd' missing </para> <para> - Provides a backwards-compatible interface of - <function>builtins.attrValues</function> for Nix version older than 1.8. + Provides a backwards-compatible interface of <function>builtins.attrValues</function> for Nix version older than 1.8. </para> <variablelist> @@ -317,14 +308,11 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; } <xi:include href="./locations.xml" xpointer="lib.attrsets.catAttrs" /> <para> - Collect each attribute named `attr' from the list of attribute sets, - <varname>sets</varname>. Sets that don't contain the named attribute are - ignored. + Collect each attribute named `attr' from the list of attribute sets, <varname>sets</varname>. Sets that don't contain the named attribute are ignored. </para> <para> - Provides a backwards-compatible interface of - <function>builtins.catAttrs</function> for Nix version older than 1.9. + Provides a backwards-compatible interface of <function>builtins.catAttrs</function> for Nix version older than 1.9. </para> <variablelist> @@ -334,8 +322,7 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; } </term> <listitem> <para> - Attribute name to select from each attribute set in - <varname>sets</varname>. + Attribute name to select from each attribute set in <varname>sets</varname>. </para> </listitem> </varlistentry> @@ -372,8 +359,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrs" /> <para> - Filter an attribute set by removing all attributes for which the given - predicate return false. + Filter an attribute set by removing all attributes for which the given predicate return false. </para> <variablelist> @@ -386,8 +372,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] <literal>String -> Any -> Bool</literal> </para> <para> - Predicate which returns true to include an attribute, or returns false to - exclude it. + Predicate which returns true to include an attribute, or returns false to exclude it. </para> <variablelist> <varlistentry> @@ -412,8 +397,7 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] </varlistentry> </variablelist> <para> - Returns <literal>true</literal> to include the attribute, - <literal>false</literal> to exclude the attribute. + Returns <literal>true</literal> to include the attribute, <literal>false</literal> to exclude the attribute. </para> </listitem> </varlistentry> @@ -447,8 +431,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; } <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrsRecursive" /> <para> - Filter an attribute set recursively by removing all attributes for which the - given predicate return false. + Filter an attribute set recursively by removing all attributes for which the given predicate return false. </para> <variablelist> @@ -461,8 +444,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; } <literal>String -> Any -> Bool</literal> </para> <para> - Predicate which returns true to include an attribute, or returns false to - exclude it. + Predicate which returns true to include an attribute, or returns false to exclude it. </para> <variablelist> <varlistentry> @@ -487,8 +469,7 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; } </varlistentry> </variablelist> <para> - Returns <literal>true</literal> to include the attribute, - <literal>false</literal> to exclude the attribute. + Returns <literal>true</literal> to include the attribute, <literal>false</literal> to exclude the attribute. </para> </listitem> </varlistentry> @@ -557,8 +538,7 @@ lib.attrsets.filterAttrsRecursive <literal>Any -> Any -> Any</literal> </para> <para> - Given a value <varname>val</varname> and a collector - <varname>col</varname>, combine the two. + Given a value <varname>val</varname> and a collector <varname>col</varname>, combine the two. </para> <variablelist> <varlistentry> @@ -578,8 +558,7 @@ lib.attrsets.filterAttrsRecursive <listitem> <!-- TODO: make this not bad, use more fold-ey terms --> <para> - The result of previous <function>op</function> calls with other values - and <function>nul</function>. + The result of previous <function>op</function> calls with other values and <function>nul</function>. </para> </listitem> </varlistentry> @@ -632,9 +611,7 @@ lib.attrsets.foldAttrs <xi:include href="./locations.xml" xpointer="lib.attrsets.collect" /> <para> - Recursively collect sets that verify a given predicate named - <varname>pred</varname> from the set <varname>attrs</varname>. The recursion - stops when <varname>pred</varname> returns <literal>true</literal>. + Recursively collect sets that verify a given predicate named <varname>pred</varname> from the set <varname>attrs</varname>. The recursion stops when <varname>pred</varname> returns <literal>true</literal>. </para> <variablelist> @@ -702,8 +679,7 @@ collect (x: x ? outPath) <xi:include href="./locations.xml" xpointer="lib.attrsets.nameValuePair" /> <para> - Utility function that creates a <literal>{name, value}</literal> pair as - expected by <function>builtins.listToAttrs</function>. + Utility function that creates a <literal>{name, value}</literal> pair as expected by <function>builtins.listToAttrs</function>. </para> <variablelist> @@ -747,13 +723,11 @@ nameValuePair "some" 6 <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs" /> <para> - Apply a function to each element in an attribute set, creating a new - attribute set. + Apply a function to each element in an attribute set, creating a new attribute set. </para> <para> - Provides a backwards-compatible interface of - <function>builtins.mapAttrs</function> for Nix version older than 2.1. + Provides a backwards-compatible interface of <function>builtins.mapAttrs</function> for Nix version older than 2.1. </para> <variablelist> @@ -814,9 +788,7 @@ lib.attrsets.mapAttrs <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs-prime" /> <para> - Like <function>mapAttrs</function>, but allows the name of each attribute to - be changed in addition to the value. The applied function should return both - the new name and value as a <function>nameValuePair</function>. + Like <function>mapAttrs</function>, but allows the name of each attribute to be changed in addition to the value. The applied function should return both the new name and value as a <function>nameValuePair</function>. </para> <variablelist> @@ -829,10 +801,8 @@ lib.attrsets.mapAttrs <literal>String -> Any -> { name = String; value = Any }</literal> </para> <para> - Given an attribute's name and value, return a new - <link - linkend="function-library-lib.attrsets.nameValuePair">name - value pair</link>. + Given an attribute's name and value, return a new <link + linkend="function-library-lib.attrsets.nameValuePair">name value pair</link>. </para> <variablelist> <varlistentry> @@ -891,8 +861,7 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name) <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsToList" /> <para> - Call <varname>fn</varname> for each attribute in the given - <varname>set</varname> and return the result in a list. + Call <varname>fn</varname> for each attribute in the given <varname>set</varname> and return the result in a list. </para> <variablelist> @@ -962,9 +931,7 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}") <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursive" /> <para> - Like <function>mapAttrs</function>, except that it recursively applies - itself to attribute sets. Also, the first argument of the argument function - is a <emphasis>list</emphasis> of the names of the containing attributes. + Like <function>mapAttrs</function>, except that it recursively applies itself to attribute sets. Also, the first argument of the argument function is a <emphasis>list</emphasis> of the names of the containing attributes. </para> <variablelist> @@ -989,10 +956,7 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}") The list of attribute names to this value. </para> <para> - For example, the <varname>name_path</varname> for the - <literal>example</literal> string in the attribute set <literal>{ foo - = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" - ]</literal>. + For example, the <varname>name_path</varname> for the <literal>example</literal> string in the attribute set <literal>{ foo = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" ]</literal>. </para> </listitem> </varlistentry> @@ -1059,11 +1023,7 @@ mapAttrsRecursive <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursiveCond" /> <para> - Like <function>mapAttrsRecursive</function>, but it takes an additional - predicate function that tells it whether to recursive into an attribute set. - If it returns false, <function>mapAttrsRecursiveCond</function> does not - recurse, but does apply the map function. It is returns true, it does - recurse, and does not apply the map function. + Like <function>mapAttrsRecursive</function>, but it takes an additional predicate function that tells it whether to recursive into an attribute set. If it returns false, <function>mapAttrsRecursiveCond</function> does not recurse, but does apply the map function. It is returns true, it does recurse, and does not apply the map function. </para> <variablelist> @@ -1076,8 +1036,7 @@ mapAttrsRecursive <literal>(AttrSet -> Bool)</literal> </para> <para> - Determine if <function>mapAttrsRecursive</function> should recurse deeper - in to the attribute set. + Determine if <function>mapAttrsRecursive</function> should recurse deeper in to the attribute set. </para> <variablelist> <varlistentry> @@ -1114,10 +1073,7 @@ mapAttrsRecursive The list of attribute names to this value. </para> <para> - For example, the <varname>name_path</varname> for the - <literal>example</literal> string in the attribute set <literal>{ foo - = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" - ]</literal>. + For example, the <varname>name_path</varname> for the <literal>example</literal> string in the attribute set <literal>{ foo = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar" ]</literal>. </para> </listitem> </varlistentry> @@ -1181,8 +1137,7 @@ lib.attrsets.mapAttrsRecursiveCond <xi:include href="./locations.xml" xpointer="lib.attrsets.genAttrs" /> <para> - Generate an attribute set by mapping a function over a list of attribute - names. + Generate an attribute set by mapping a function over a list of attribute names. </para> <variablelist> @@ -1241,8 +1196,7 @@ lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}") <xi:include href="./locations.xml" xpointer="lib.attrsets.isDerivation" /> <para> - Check whether the argument is a derivation. Any set with <code>{ type = - "derivation"; }</code> counts as a derivation. + Check whether the argument is a derivation. Any set with <code>{ type = "derivation"; }</code> counts as a derivation. </para> <variablelist> @@ -1320,8 +1274,7 @@ lib.attrsets.isDerivation "foobar" </term> <listitem> <para> - Condition under which the <varname>as</varname> attribute set is - returned. + Condition under which the <varname>as</varname> attribute set is returned. </para> </listitem> </varlistentry> @@ -1363,8 +1316,7 @@ lib.attrsets.optionalAttrs false { my = "set"; } <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWithNames" /> <para> - Merge sets of attributes and use the function <varname>f</varname> to merge - attribute values where the attribute name is in <varname>names</varname>. + Merge sets of attributes and use the function <varname>f</varname> to merge attribute values where the attribute name is in <varname>names</varname>. </para> <variablelist> @@ -1451,11 +1403,8 @@ lib.attrsets.zipAttrsWithNames <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWith" /> <para> - Merge sets of attributes and use the function <varname>f</varname> to merge - attribute values. Similar to - <xref - linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where - all key names are passed for <varname>names</varname>. + Merge sets of attributes and use the function <varname>f</varname> to merge attribute values. Similar to <xref + linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where all key names are passed for <varname>names</varname>. </para> <variablelist> @@ -1531,9 +1480,7 @@ lib.attrsets.zipAttrsWith <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" /> <para> - Merge sets of attributes and combine each attribute value in to a list. - Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" /> - where the merge function returns a list of all values. + Merge sets of attributes and combine each attribute value in to a list. Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" /> where the merge function returns a list of all values. </para> <variablelist> @@ -1573,12 +1520,7 @@ lib.attrsets.zipAttrs <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdateUntil" /> <para> - Does the same as the update operator <literal>//</literal> except that - attributes are merged until the given predicate is verified. The predicate - should accept 3 arguments which are the path to reach the attribute, a part - of the first attribute set and a part of the second attribute set. When the - predicate is verified, the value of the first attribute set is replaced by - the value of the second attribute set. + Does the same as the update operator <literal>//</literal> except that attributes are merged until the given predicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When the predicate is verified, the value of the first attribute set is replaced by the value of the second attribute set. </para> <variablelist> @@ -1681,10 +1623,7 @@ lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"]) <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdate" /> <para> - A recursive variant of the update operator <literal>//</literal>. The - recursion stops when one of the attribute values is not an attribute set, in - which case the right hand side value takes precedence over the left hand - side value. + A recursive variant of the update operator <literal>//</literal>. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the left hand side value. </para> <variablelist> diff --git a/doc/functions/nix-gitignore.xml b/doc/functions/nix-gitignore.xml index 9011570d1ea..37a82b196cc 100644 --- a/doc/functions/nix-gitignore.xml +++ b/doc/functions/nix-gitignore.xml @@ -5,21 +5,14 @@ <title>pkgs.nix-gitignore</title> <para> - <function>pkgs.nix-gitignore</function> is a function that acts similarly to - <literal>builtins.filterSource</literal> but also allows filtering with the - help of the gitignore format. + <function>pkgs.nix-gitignore</function> is a function that acts similarly to <literal>builtins.filterSource</literal> but also allows filtering with the help of the gitignore format. </para> <section xml:id="sec-pkgs-nix-gitignore-usage"> <title>Usage</title> <para> - <literal>pkgs.nix-gitignore</literal> exports a number of functions, but - you'll most likely need either <literal>gitignoreSource</literal> or - <literal>gitignoreSourcePure</literal>. As their first argument, they both - accept either 1. a file with gitignore lines or 2. a string with gitignore - lines, or 3. a list of either of the two. They will be concatenated into a - single big string. + <literal>pkgs.nix-gitignore</literal> exports a number of functions, but you'll most likely need either <literal>gitignoreSource</literal> or <literal>gitignoreSourcePure</literal>. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. </para> <programlisting><![CDATA[ @@ -40,8 +33,7 @@ ]]></programlisting> <para> - These functions are derived from the <literal>Filter</literal> functions by - setting the first filter argument to <literal>(_: _: true)</literal>: + These functions are derived from the <literal>Filter</literal> functions by setting the first filter argument to <literal>(_: _: true)</literal>: </para> <programlisting><![CDATA[ @@ -50,12 +42,7 @@ gitignoreSource = gitignoreFilterSource (_: _: true); ]]></programlisting> <para> - Those filter functions accept the same arguments the - <literal>builtins.filterSource</literal> function would pass to its filters, - thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be - extensionally equivalent to <literal>filterSource</literal>. The file is - blacklisted iff it's blacklisted by either your filter or the - gitignoreFilter. + Those filter functions accept the same arguments the <literal>builtins.filterSource</literal> function would pass to its filters, thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be extensionally equivalent to <literal>filterSource</literal>. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter. </para> <para> @@ -71,8 +58,7 @@ gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; <title>gitignore files in subdirectories</title> <para> - If you wish to use a filter that would search for .gitignore files in - subdirectories, just like git does by default, use this function: + If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function: </para> <programlisting><![CDATA[ diff --git a/doc/functions/ocitools.xml b/doc/functions/ocitools.xml index 56de0c22ec6..f61075b242f 100644 --- a/doc/functions/ocitools.xml +++ b/doc/functions/ocitools.xml @@ -5,26 +5,18 @@ <title>pkgs.ociTools</title> <para> - <varname>pkgs.ociTools</varname> is a set of functions for creating - containers according to the - <link xlink:href="https://github.com/opencontainers/runtime-spec">OCI - container specification v1.0.0</link>. Beyond that it makes no assumptions - about the container runner you choose to use to run the created container. + <varname>pkgs.ociTools</varname> is a set of functions for creating containers according to the <link xlink:href="https://github.com/opencontainers/runtime-spec">OCI container specification v1.0.0</link>. Beyond that it makes no assumptions about the container runner you choose to use to run the created container. </para> <section xml:id="ssec-pkgs-ociTools-buildContainer"> <title>buildContainer</title> <para> - This function creates a simple OCI container that runs a single command - inside of it. An OCI container consists of a <varname>config.json</varname> - and a rootfs directory.The nix store of the container will contain all - referenced dependencies of the given command. + This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a <varname>config.json</varname> and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command. </para> <para> - The parameters of <varname>buildContainer</varname> with an example value - are described below: + The parameters of <varname>buildContainer</varname> with an example value are described below: </para> <example xml:id='ex-ociTools-buildContainer'> @@ -51,23 +43,17 @@ buildContainer { <calloutlist> <callout arearefs='ex-ociTools-buildContainer-1'> <para> - <varname>args</varname> specifies a set of arguments to run inside the - container. This is the only required argument for - <varname>buildContainer</varname>. All referenced packages inside the - derivation will be made available inside the container + <varname>args</varname> specifies a set of arguments to run inside the container. This is the only required argument for <varname>buildContainer</varname>. All referenced packages inside the derivation will be made available inside the container </para> </callout> <callout arearefs='ex-ociTools-buildContainer-2'> <para> - <varname>mounts</varname> specifies additional mount points chosen by the - user. By default only a minimal set of necessary filesystems are mounted - into the container (e.g procfs, cgroupfs) + <varname>mounts</varname> specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) </para> </callout> <callout arearefs='ex-ociTools-buildContainer-3'> <para> - <varname>readonly</varname> makes the container's rootfs read-only if it - is set to true. The default value is false <literal>false</literal>. + <varname>readonly</varname> makes the container's rootfs read-only if it is set to true. The default value is false <literal>false</literal>. </para> </callout> </calloutlist> diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml index 1bd90d2a0c7..4ba4283c609 100644 --- a/doc/functions/overrides.xml +++ b/doc/functions/overrides.xml @@ -5,23 +5,18 @@ <title>Overriding</title> <para> - Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g. - derivation attributes, the results of derivations. + Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g. derivation attributes, the results of derivations. </para> <para> - These functions are used to make changes to packages, returning only single - packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other - hand, can be used to combine the overridden packages across the entire - package set of Nixpkgs. + These functions are used to make changes to packages, returning only single packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other hand, can be used to combine the overridden packages across the entire package set of Nixpkgs. </para> <section xml:id="sec-pkg-override"> <title><pkg>.override</title> <para> - The function <varname>override</varname> is usually available for all the - derivations in the nixpkgs expression (<varname>pkgs</varname>). + The function <varname>override</varname> is usually available for all the derivations in the nixpkgs expression (<varname>pkgs</varname>). </para> <para> @@ -47,10 +42,7 @@ mypkg = pkgs.callPackage ./mypkg.nix { </para> <para> - In the first example, <varname>pkgs.foo</varname> is the result of a - function call with some default arguments, usually a derivation. Using - <varname>pkgs.foo.override</varname> will call the same function with the - given new arguments. + In the first example, <varname>pkgs.foo</varname> is the result of a function call with some default arguments, usually a derivation. Using <varname>pkgs.foo.override</varname> will call the same function with the given new arguments. </para> </section> @@ -58,12 +50,7 @@ mypkg = pkgs.callPackage ./mypkg.nix { <title><pkg>.overrideAttrs</title> <para> - The function <varname>overrideAttrs</varname> allows overriding the - attribute set passed to a <varname>stdenv.mkDerivation</varname> call, - producing a new derivation based on the original one. This function is - available on all derivations produced by the - <varname>stdenv.mkDerivation</varname> function, which is most packages in - the nixpkgs expression <varname>pkgs</varname>. + The function <varname>overrideAttrs</varname> allows overriding the attribute set passed to a <varname>stdenv.mkDerivation</varname> call, producing a new derivation based on the original one. This function is available on all derivations produced by the <varname>stdenv.mkDerivation</varname> function, which is most packages in the nixpkgs expression <varname>pkgs</varname>. </para> <para> @@ -76,30 +63,16 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { </para> <para> - In the above example, the <varname>separateDebugInfo</varname> attribute is - overridden to be true, thus building debug info for - <varname>helloWithDebug</varname>, while all other attributes will be - retained from the original <varname>hello</varname> package. + In the above example, the <varname>separateDebugInfo</varname> attribute is overridden to be true, thus building debug info for <varname>helloWithDebug</varname>, while all other attributes will be retained from the original <varname>hello</varname> package. </para> <para> - The argument <varname>oldAttrs</varname> is conventionally used to refer to - the attr set originally passed to <varname>stdenv.mkDerivation</varname>. + The argument <varname>oldAttrs</varname> is conventionally used to refer to the attr set originally passed to <varname>stdenv.mkDerivation</varname>. </para> <note> <para> - Note that <varname>separateDebugInfo</varname> is processed only by the - <varname>stdenv.mkDerivation</varname> function, not the generated, raw Nix - derivation. Thus, using <varname>overrideDerivation</varname> will not work - in this case, as it overrides only the attributes of the final derivation. - It is for this reason that <varname>overrideAttrs</varname> should be - preferred in (almost) all cases to <varname>overrideDerivation</varname>, - i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input - arguments, as well as the fact that it is easier to use (you can use the - same attribute names you see in your Nix code, instead of the ones - generated (e.g. <varname>buildInputs</varname> vs - <varname>nativeBuildInputs</varname>), and it involves less typing). + Note that <varname>separateDebugInfo</varname> is processed only by the <varname>stdenv.mkDerivation</varname> function, not the generated, raw Nix derivation. Thus, using <varname>overrideDerivation</varname> will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that <varname>overrideAttrs</varname> should be preferred in (almost) all cases to <varname>overrideDerivation</varname>, i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>), and it involves less typing). </para> </note> </section> @@ -109,34 +82,18 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { <warning> <para> - You should prefer <varname>overrideAttrs</varname> in almost all cases, see - its documentation for the reasons why. - <varname>overrideDerivation</varname> is not deprecated and will continue - to work, but is less nice to use and does not have as many abilities as - <varname>overrideAttrs</varname>. + You should prefer <varname>overrideAttrs</varname> in almost all cases, see its documentation for the reasons why. <varname>overrideDerivation</varname> is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as <varname>overrideAttrs</varname>. </para> </warning> <warning> <para> - Do not use this function in Nixpkgs as it evaluates a Derivation before - modifying it, which breaks package abstraction and removes error-checking - of function arguments. In addition, this evaluation-per-function - application incurs a performance penalty, which can become a problem if - many overrides are used. It is only intended for ad-hoc customisation, such - as in <filename>~/.config/nixpkgs/config.nix</filename>. + Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in <filename>~/.config/nixpkgs/config.nix</filename>. </para> </warning> <para> - The function <varname>overrideDerivation</varname> creates a new derivation - based on an existing one by overriding the original's attributes with the - attribute set produced by the specified function. This function is available - on all derivations defined using the <varname>makeOverridable</varname> - function. Most standard derivation-producing functions, such as - <varname>stdenv.mkDerivation</varname>, are defined using this function, - which means most packages in the nixpkgs expression, - <varname>pkgs</varname>, have this function. + The function <varname>overrideDerivation</varname> creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the <varname>makeOverridable</varname> function. Most standard derivation-producing functions, such as <varname>stdenv.mkDerivation</varname>, are defined using this function, which means most packages in the nixpkgs expression, <varname>pkgs</varname>, have this function. </para> <para> @@ -154,27 +111,16 @@ mySed = pkgs.gnused.overrideDerivation (oldAttrs: { </para> <para> - In the above example, the <varname>name</varname>, <varname>src</varname>, - and <varname>patches</varname> of the derivation will be overridden, while - all other attributes will be retained from the original derivation. + In the above example, the <varname>name</varname>, <varname>src</varname>, and <varname>patches</varname> of the derivation will be overridden, while all other attributes will be retained from the original derivation. </para> <para> - The argument <varname>oldAttrs</varname> is used to refer to the attribute - set of the original derivation. + The argument <varname>oldAttrs</varname> is used to refer to the attribute set of the original derivation. </para> <note> <para> - A package's attributes are evaluated *before* being modified by the - <varname>overrideDerivation</varname> function. For example, the - <varname>name</varname> attribute reference in <varname>url = - "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the - <varname>overrideDerivation</varname> function modifies the attribute set. - This means that overriding the <varname>name</varname> attribute, in this - example, *will not* change the value of the <varname>url</varname> - attribute. Instead, we need to override both the <varname>name</varname> - *and* <varname>url</varname> attributes. + A package's attributes are evaluated *before* being modified by the <varname>overrideDerivation</varname> function. For example, the <varname>name</varname> attribute reference in <varname>url = "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the <varname>overrideDerivation</varname> function modifies the attribute set. This means that overriding the <varname>name</varname> attribute, in this example, *will not* change the value of the <varname>url</varname> attribute. Instead, we need to override both the <varname>name</varname> *and* <varname>url</varname> attributes. </para> </note> </section> @@ -183,9 +129,7 @@ mySed = pkgs.gnused.overrideDerivation (oldAttrs: { <title>lib.makeOverridable</title> <para> - The function <varname>lib.makeOverridable</varname> is used to make the - result of a function easily customizable. This utility only makes sense for - functions that accept an argument set and return an attribute set. + The function <varname>lib.makeOverridable</varname> is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set. </para> <para> @@ -197,16 +141,11 @@ c = lib.makeOverridable f { a = 1; b = 2; }; </para> <para> - The variable <varname>c</varname> is the value of the <varname>f</varname> - function applied with some default arguments. Hence the value of - <varname>c.result</varname> is <literal>3</literal>, in this example. + The variable <varname>c</varname> is the value of the <varname>f</varname> function applied with some default arguments. Hence the value of <varname>c.result</varname> is <literal>3</literal>, in this example. </para> <para> - The variable <varname>c</varname> however also has some additional - functions, like <link linkend="sec-pkg-override">c.override</link> which can - be used to override the default arguments. In this example the value of - <varname>(c.override { a = 4; }).result</varname> is 6. + The variable <varname>c</varname> however also has some additional functions, like <link linkend="sec-pkg-override">c.override</link> which can be used to override the default arguments. In this example the value of <varname>(c.override { a = 4; }).result</varname> is 6. </para> </section> </section> diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml index 3e43fd28ade..94d25d3d3ae 100644 --- a/doc/functions/prefer-remote-fetch.xml +++ b/doc/functions/prefer-remote-fetch.xml @@ -5,16 +5,12 @@ <title>prefer-remote-fetch overlay</title> <para> - <function>prefer-remote-fetch</function> is an overlay that download sources - on remote builder. This is useful when the evaluating machine has a slow - upload while the builder can fetch faster directly from the source. To use - it, put the following snippet as a new overlay: + <function>prefer-remote-fetch</function> is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: <programlisting> self: super: (super.prefer-remote-fetch self super) </programlisting> - A full configuration example for that sets the overlay up for your own - account, could look like this + A full configuration example for that sets the overlay up for your own account, could look like this <screen> <prompt>$ </prompt>mkdir ~/.config/nixpkgs/overlays/ <prompt>$ </prompt>cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml index e5031c9463c..cef65d06b88 100644 --- a/doc/functions/shell.xml +++ b/doc/functions/shell.xml @@ -5,9 +5,7 @@ <title>pkgs.mkShell</title> <para> - <function>pkgs.mkShell</function> is a special kind of derivation that is - only useful when using it combined with <command>nix-shell</command>. It will - in fact fail to instantiate when invoked with <command>nix-build</command>. + <function>pkgs.mkShell</function> is a special kind of derivation that is only useful when using it combined with <command>nix-shell</command>. It will in fact fail to instantiate when invoked with <command>nix-build</command>. </para> <section xml:id="sec-pkgs-mkShell-usage"> diff --git a/doc/functions/snaptools.xml b/doc/functions/snaptools.xml index d0e3efdf6c6..422fcfa37d8 100644 --- a/doc/functions/snaptools.xml +++ b/doc/functions/snaptools.xml @@ -5,28 +5,22 @@ <title>pkgs.snapTools</title> <para> - <varname>pkgs.snapTools</varname> is a set of functions for creating - Snapcraft images. Snap and Snapcraft is not used to perform these operations. + <varname>pkgs.snapTools</varname> is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations. </para> <section xml:id="ssec-pkgs-snapTools-makeSnap-signature"> <title>The makeSnap Function</title> <para> - <function>makeSnap</function> takes a single named argument, - <parameter>meta</parameter>. This argument mirrors - <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream - <filename>snap.yaml</filename> format</link> exactly. + <function>makeSnap</function> takes a single named argument, <parameter>meta</parameter>. This argument mirrors <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream <filename>snap.yaml</filename> format</link> exactly. </para> <para> - The <parameter>base</parameter> should not be be specified, as - <function>makeSnap</function> will force set it. + The <parameter>base</parameter> should not be be specified, as <function>makeSnap</function> will force set it. </para> <para> - Currently, <function>makeSnap</function> does not support creating GUI - stubs. + Currently, <function>makeSnap</function> does not support creating GUI stubs. </para> </section> @@ -40,9 +34,7 @@ </para> <programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting> <para> - <command>nix-build</command> this expression and install it with - <command>snap install ./result --dangerous</command>. - <command>hello</command> will now be the Snapcraft version of the package. + <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>hello</command> will now be the Snapcraft version of the package. </para> </example> </section> @@ -53,21 +45,14 @@ <example xml:id="ex-snapTools-buildSnap-firefox"> <title>Making a Graphical Snap</title> <para> - Graphical programs require many more integrations with the host. This - example uses Firefox as an example, because it is one of the most - complicated programs we could package. + Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. </para> <programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting> <para> - <command>nix-build</command> this expression and install it with - <command>snap install ./result --dangerous</command>. - <command>nix-example-firefox</command> will now be the Snapcraft version of - the Firefox package. + <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. <command>nix-example-firefox</command> will now be the Snapcraft version of the Firefox package. </para> <para> - The specific meaning behind plugs can be looked up in the - <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft - interface documentation</link>. + The specific meaning behind plugs can be looked up in the <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft interface documentation</link>. </para> </example> </section> diff --git a/doc/functions/trivial-builders.xml b/doc/functions/trivial-builders.xml index 0211a4f3172..ae9f3a1b255 100644 --- a/doc/functions/trivial-builders.xml +++ b/doc/functions/trivial-builders.xml @@ -5,11 +5,7 @@ <title>Trivial builders</title> <para> - Nixpkgs provides a couple of functions that help with building derivations. - The most important one, <function>stdenv.mkDerivation</function>, has already - been documented above. The following functions wrap - <function>stdenv.mkDerivation</function>, making it easier to use in certain - cases. + Nixpkgs provides a couple of functions that help with building derivations. The most important one, <function>stdenv.mkDerivation</function>, has already been documented above. The following functions wrap <function>stdenv.mkDerivation</function>, making it easier to use in certain cases. </para> <variablelist> @@ -19,17 +15,7 @@ </term> <listitem> <para> - This takes three arguments, <literal>name</literal>, - <literal>env</literal>, and <literal>buildCommand</literal>. - <literal>name</literal> is just the name that Nix will append to the store - path in the same way that <literal>stdenv.mkDerivation</literal> uses its - <literal>name</literal> attribute. <literal>env</literal> is an attribute - set specifying environment variables that will be set for this derivation. - These attributes are then passed to the wrapped - <literal>stdenv.mkDerivation</literal>. <literal>buildCommand</literal> - specifies the commands that will be run to create this derivation. Note - that you will need to create <literal>$out</literal> for Nix to register - the command as successful. + This takes three arguments, <literal>name</literal>, <literal>env</literal>, and <literal>buildCommand</literal>. <literal>name</literal> is just the name that Nix will append to the store path in the same way that <literal>stdenv.mkDerivation</literal> uses its <literal>name</literal> attribute. <literal>env</literal> is an attribute set specifying environment variables that will be set for this derivation. These attributes are then passed to the wrapped <literal>stdenv.mkDerivation</literal>. <literal>buildCommand</literal> specifies the commands that will be run to create this derivation. Note that you will need to create <literal>$out</literal> for Nix to register the command as successful. </para> <para> An example of using <literal>runCommand</literal> is provided below. @@ -62,10 +48,7 @@ </term> <listitem> <para> - This works just like <literal>runCommand</literal>. The only difference is - that it also provides a C compiler in <literal>buildCommand</literal>’s - environment. To minimize your dependencies, you should only use this if - you are sure you will need a C compiler as part of running your command. + This works just like <literal>runCommand</literal>. The only difference is that it also provides a C compiler in <literal>buildCommand</literal>’s environment. To minimize your dependencies, you should only use this if you are sure you will need a C compiler as part of running your command. </para> </listitem> </varlistentry> @@ -75,20 +58,10 @@ </term> <listitem> <para> - These functions write <literal>text</literal> to the Nix store. This is - useful for creating scripts from Nix expressions. - <literal>writeTextFile</literal> takes an attribute set and expects two - arguments, <literal>name</literal> and <literal>text</literal>. - <literal>name</literal> corresponds to the name used in the Nix store - path. <literal>text</literal> will be the contents of the file. You can - also set <literal>executable</literal> to true to make this file have the - executable bit set. + These functions write <literal>text</literal> to the Nix store. This is useful for creating scripts from Nix expressions. <literal>writeTextFile</literal> takes an attribute set and expects two arguments, <literal>name</literal> and <literal>text</literal>. <literal>name</literal> corresponds to the name used in the Nix store path. <literal>text</literal> will be the contents of the file. You can also set <literal>executable</literal> to true to make this file have the executable bit set. </para> <para> - Many more commands wrap <literal>writeTextFile</literal> including - <literal>writeText</literal>, <literal>writeTextDir</literal>, - <literal>writeScript</literal>, and <literal>writeScriptBin</literal>. - These are convenience functions over <literal>writeTextFile</literal>. + Many more commands wrap <literal>writeTextFile</literal> including <literal>writeText</literal>, <literal>writeTextDir</literal>, <literal>writeScript</literal>, and <literal>writeScriptBin</literal>. These are convenience functions over <literal>writeTextFile</literal>. </para> </listitem> </varlistentry> @@ -98,14 +71,7 @@ </term> <listitem> <para> - This can be used to put many derivations into the same directory - structure. It works by creating a new derivation and adding symlinks to - each of the paths listed. It expects two arguments, - <literal>name</literal>, and <literal>paths</literal>. - <literal>name</literal> is the name used in the Nix store path for the - created derivation. <literal>paths</literal> is a list of paths that will - be symlinked. These paths can be to Nix store derivations or any other - subdirectory contained within. + This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, <literal>name</literal>, and <literal>paths</literal>. <literal>name</literal> is the name used in the Nix store path for the created derivation. <literal>paths</literal> is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. </para> </listitem> </varlistentry> diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index dee7f2d7419..65f28d0a2d3 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -7,12 +7,7 @@ <title>Introduction</title> <para> - In this document and related Nix expressions, we use the term, - <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of - the Erlang Virtual Machine and, as far as we're concerned, from a packaging - perspective, all languages that run on the BEAM are interchangeable. That - which varies, like the build system, is transparent to users of any given - BEAM package, so we make no distinction. + In this document and related Nix expressions, we use the term, <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. </para> </section> @@ -20,57 +15,36 @@ <title>Structure</title> <para> - All BEAM-related expressions are available via the top-level - <literal>beam</literal> attribute, which includes: + All BEAM-related expressions are available via the top-level <literal>beam</literal> attribute, which includes: </para> <itemizedlist> <listitem> <para> - <literal>interpreters</literal>: a set of compilers running on the BEAM, - including multiple Erlang/OTP versions - (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir - (<literal>beam.interpreters.elixir</literal>) and LFE - (<literal>beam.interpreters.lfe</literal>). + <literal>interpreters</literal>: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir (<literal>beam.interpreters.elixir</literal>) and LFE (<literal>beam.interpreters.lfe</literal>). </para> </listitem> <listitem> <para> - <literal>packages</literal>: a set of package sets, each compiled with a - specific Erlang/OTP version, e.g. - <literal>beam.packages.erlangR19</literal>. + <literal>packages</literal>: a set of package sets, each compiled with a specific Erlang/OTP version, e.g. <literal>beam.packages.erlangR19</literal>. </para> </listitem> </itemizedlist> <para> - The default Erlang compiler, defined by - <literal>beam.interpreters.erlang</literal>, is aliased as - <literal>erlang</literal>. The default BEAM package set is defined by - <literal>beam.packages.erlang</literal> and aliased at the top level as - <literal>beamPackages</literal>. + The default Erlang compiler, defined by <literal>beam.interpreters.erlang</literal>, is aliased as <literal>erlang</literal>. The default BEAM package set is defined by <literal>beam.packages.erlang</literal> and aliased at the top level as <literal>beamPackages</literal>. </para> <para> - To create a package set built with a custom Erlang version, use the lambda, - <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation - and produces a package set similar to - <literal>beam.packages.erlang</literal>. + To create a package set built with a custom Erlang version, use the lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation and produces a package set similar to <literal>beam.packages.erlang</literal>. </para> <para> - Many Erlang/OTP distributions available in - <literal>beam.interpreters</literal> have versions with ODBC and/or Java - enabled. For example, there's - <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds - to <literal>beam.interpreters.erlangR19</literal>. + Many Erlang/OTP distributions available in <literal>beam.interpreters</literal> have versions with ODBC and/or Java enabled. For example, there's <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds to <literal>beam.interpreters.erlangR19</literal>. </para> <para xml:id="erlang-call-package"> - We also provide the lambda, - <literal>beam.packages.erlang.callPackage</literal>, which simplifies - writing BEAM package definitions by injecting all packages from - <literal>beam.packages.erlang</literal> into the top-level context. + We also provide the lambda, <literal>beam.packages.erlang.callPackage</literal>, which simplifies writing BEAM package definitions by injecting all packages from <literal>beam.packages.erlang</literal> into the top-level context. </para> </section> @@ -81,24 +55,16 @@ <title>Rebar3</title> <para> - By default, Rebar3 wants to manage its own dependencies. This is perfectly - acceptable in the normal, non-Nix setup, but in the Nix world, it is not. - To rectify this, we provide two versions of Rebar3: + By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3: <itemizedlist> <listitem> <para> - <literal>rebar3</literal>: patched to remove the ability to download - anything. When not running it via <literal>nix-shell</literal> or - <literal>nix-build</literal>, it's probably not going to work as - desired. + <literal>rebar3</literal>: patched to remove the ability to download anything. When not running it via <literal>nix-shell</literal> or <literal>nix-build</literal>, it's probably not going to work as desired. </para> </listitem> <listitem> <para> - <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should - work exactly as would any other version of Rebar3. Any Erlang package - should rely on <literal>rebar3</literal> instead. See - <xref + <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on <literal>rebar3</literal> instead. See <xref linkend="rebar3-packages"/>. </para> </listitem> @@ -110,10 +76,7 @@ <title>Mix & Erlang.mk</title> <para> - Both Mix and Erlang.mk work exactly as expected. There is a bootstrap - process that needs to be run for both, however, which is supported by the - <literal>buildMix</literal> and <literal>buildErlangMk</literal> - derivations, respectively. + Both Mix and Erlang.mk work exactly as expected. There is a bootstrap process that needs to be run for both, however, which is supported by the <literal>buildMix</literal> and <literal>buildErlangMk</literal> derivations, respectively. </para> </section> </section> @@ -122,13 +85,7 @@ <title>How to Install BEAM Packages</title> <para> - BEAM packages are not registered at the top level, simply because they are - not relevant to the vast majority of Nix users. They are installable using - the <literal>beam.packages.erlang</literal> attribute set (aliased as - <literal>beamPackages</literal>), which points to packages built by the - default Erlang/OTP version in Nixpkgs, as defined by - <literal>beam.interpreters.erlang</literal>. To list the available packages - in <literal>beamPackages</literal>, use the following command: + BEAM packages are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. They are installable using the <literal>beam.packages.erlang</literal> attribute set (aliased as <literal>beamPackages</literal>), which points to packages built by the default Erlang/OTP version in Nixpkgs, as defined by <literal>beam.interpreters.erlang</literal>. To list the available packages in <literal>beamPackages</literal>, use the following command: </para> <screen> @@ -143,8 +100,7 @@ beamPackages.rebar3-pc pc-1.1.0 </screen> <para> - To install any of those packages into your profile, refer to them by their - attribute path (first column): + To install any of those packages into your profile, refer to them by their attribute path (first column): </para> <screen> @@ -152,9 +108,7 @@ beamPackages.rebar3-pc pc-1.1.0 </screen> <para> - The attribute path of any BEAM package corresponds to the name of that - particular package in <link xlink:href="https://hex.pm">Hex</link> or its - OTP Application/Release name. + The attribute path of any BEAM package corresponds to the name of that particular package in <link xlink:href="https://hex.pm">Hex</link> or its OTP Application/Release name. </para> </section> @@ -168,13 +122,8 @@ beamPackages.rebar3-pc pc-1.1.0 <title>Rebar3 Packages</title> <para> - The Nix function, <literal>buildRebar3</literal>, defined in - <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top - level, can be used to build a derivation that understands how to build a - Rebar3 project. For example, we can build - <link - xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> - as follows: + The Nix function, <literal>buildRebar3</literal>, defined in <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project. For example, we can build <link + xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as follows: </para> <programlisting> @@ -196,25 +145,16 @@ buildRebar3 rec { </programlisting> <para> - Such derivations are callable with - <literal>beam.packages.erlang.callPackage</literal> (see - <xref - linkend="erlang-call-package"/>). To call this package using - the normal <literal>callPackage</literal>, refer to dependency packages - via <literal>beamPackages</literal>, e.g. - <literal>beamPackages.ibrowse</literal>. + Such derivations are callable with <literal>beam.packages.erlang.callPackage</literal> (see <xref + linkend="erlang-call-package"/>). To call this package using the normal <literal>callPackage</literal>, refer to dependency packages via <literal>beamPackages</literal>, e.g. <literal>beamPackages.ibrowse</literal>. </para> <para> - Notably, <literal>buildRebar3</literal> includes - <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal> - does not. BEAM dependencies added there will be correctly handled by the - system. + Notably, <literal>buildRebar3</literal> includes <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added there will be correctly handled by the system. </para> <para> - If a package needs to compile native code via Rebar3's port compilation - mechanism, add <literal>compilePort = true;</literal> to the derivation. + If a package needs to compile native code via Rebar3's port compilation mechanism, add <literal>compilePort = true;</literal> to the derivation. </para> </section> @@ -222,9 +162,7 @@ buildRebar3 rec { <title>Erlang.mk Packages</title> <para> - Erlang.mk functions similarly to Rebar3, except we use - <literal>buildErlangMk</literal> instead of - <literal>buildRebar3</literal>. + Erlang.mk functions similarly to Rebar3, except we use <literal>buildErlangMk</literal> instead of <literal>buildRebar3</literal>. </para> <programlisting> @@ -257,8 +195,7 @@ buildErlangMk { <title>Mix Packages</title> <para> - Mix functions similarly to Rebar3, except we use - <literal>buildMix</literal> instead of <literal>buildRebar3</literal>. + Mix functions similarly to Rebar3, except we use <literal>buildMix</literal> instead of <literal>buildRebar3</literal>. </para> <programlisting> @@ -323,11 +260,7 @@ buildHex { <title>Accessing an Environment</title> <para> - Often, we simply want to access a valid environment that contains a - specific package and its dependencies. We can accomplish that with the - <literal>env</literal> attribute of a derivation. For example, let's say we - want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We - could do the following: + Often, we simply want to access a valid environment that contains a specific package and its dependencies. We can accomplish that with the <literal>env</literal> attribute of a derivation. For example, let's say we want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We could do the following: </para> <screen> @@ -373,8 +306,7 @@ ok</computeroutput> </screen> <para> - Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key - to this functionality. + Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key to this functionality. </para> </section> @@ -382,11 +314,7 @@ ok</computeroutput> <title>Creating a Shell</title> <para> - Getting access to an environment often isn't enough to do real development. - Usually, we need to create a <literal>shell.nix</literal> file and do our - development inside of the environment specified therein. This file looks a - lot like the packaging described above, except that <literal>src</literal> - points to the project root and we call the package directly. + Getting access to an environment often isn't enough to do real development. Usually, we need to create a <literal>shell.nix</literal> file and do our development inside of the environment specified therein. This file looks a lot like the packaging described above, except that <literal>src</literal> points to the project root and we call the package directly. </para> <programlisting> @@ -414,8 +342,7 @@ in <title>Building in a Shell (for Mix Projects)</title> <para> - We can leverage the support of the derivation, irrespective of the build - derivation, by calling the commands themselves. + We can leverage the support of the derivation, irrespective of the build derivation, by calling the commands themselves. </para> <programlisting> @@ -477,12 +404,8 @@ analyze: build plt </programlisting> <para> - Using a <literal>shell.nix</literal> as described (see - <xref - linkend="creating-a-shell"/>) should just work. Aside from - <literal>test</literal>, <literal>plt</literal>, and - <literal>analyze</literal>, the Make targets work just fine for all of the - build derivations. + Using a <literal>shell.nix</literal> as described (see <xref + linkend="creating-a-shell"/>) should just work. Aside from <literal>test</literal>, <literal>plt</literal>, and <literal>analyze</literal>, the Make targets work just fine for all of the build derivations. </para> </section> </section> @@ -492,25 +415,14 @@ analyze: build plt <title>Generating Packages from Hex with <literal>hex2nix</literal></title> <para> - Updating the <link xlink:href="https://hex.pm">Hex</link> package set - requires - <link - xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. - Given the path to the Erlang modules (usually - <literal>pkgs/development/erlang-modules</literal>), it will dump a file - called <literal>hex-packages.nix</literal>, containing all the packages that - use a recognized build system in - <link - xlink:href="https://hex.pm">Hex</link>. It can't be determined, - however, whether every package is buildable. + Updating the <link xlink:href="https://hex.pm">Hex</link> package set requires <link + xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the path to the Erlang modules (usually <literal>pkgs/development/erlang-modules</literal>), it will dump a file called <literal>hex-packages.nix</literal>, containing all the packages that use a recognized build system in <link + xlink:href="https://hex.pm">Hex</link>. It can't be determined, however, whether every package is buildable. </para> <para> - To make life easier for our users, try to build every - <link - xlink:href="https://hex.pm">Hex</link> package and remove those - that fail. To do that, simply run the following command in the root of your - <literal>nixpkgs</literal> repository: + To make life easier for our users, try to build every <link + xlink:href="https://hex.pm">Hex</link> package and remove those that fail. To do that, simply run the following command in the root of your <literal>nixpkgs</literal> repository: </para> <screen> @@ -518,11 +430,8 @@ analyze: build plt </screen> <para> - That will attempt to build every package in <literal>beamPackages</literal>. - Then manually remove those that fail. Hopefully, someone will improve - <link - xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> - in the future to automate the process. + That will attempt to build every package in <literal>beamPackages</literal>. Then manually remove those that fail. Hopefully, someone will improve <link + xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the future to automate the process. </para> </section> </section> diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml index 118f6e10473..b0738cad293 100644 --- a/doc/languages-frameworks/bower.xml +++ b/doc/languages-frameworks/bower.xml @@ -4,32 +4,22 @@ <title>Bower</title> <para> - <link xlink:href="http://bower.io">Bower</link> is a package manager for web - site front-end components. Bower packages (comprising of build artefacts and - sometimes sources) are stored in <command>git</command> repositories, - typically on Github. The package registry is run by the Bower team with - package metadata coming from the <filename>bower.json</filename> file within - each package. + <link xlink:href="http://bower.io">Bower</link> is a package manager for web site front-end components. Bower packages (comprising of build artefacts and sometimes sources) are stored in <command>git</command> repositories, typically on Github. The package registry is run by the Bower team with package metadata coming from the <filename>bower.json</filename> file within each package. </para> <para> - The end result of running Bower is a <filename>bower_components</filename> - directory which can be included in the web app's build process. + The end result of running Bower is a <filename>bower_components</filename> directory which can be included in the web app's build process. </para> <para> - Bower can be run interactively, by installing - <varname>nodePackages.bower</varname>. More interestingly, the Bower - components can be declared in a Nix derivation, with the help of - <varname>nodePackages.bower2nix</varname>. + Bower can be run interactively, by installing <varname>nodePackages.bower</varname>. More interestingly, the Bower components can be declared in a Nix derivation, with the help of <varname>nodePackages.bower2nix</varname>. </para> <section xml:id="ssec-bower2nix-usage"> <title><command>bower2nix</command> usage</title> <para> - Suppose you have a <filename>bower.json</filename> with the following - contents: + Suppose you have a <filename>bower.json</filename> with the following contents: <example xml:id="ex-bowerJson"> <title><filename>bower.json</filename></title> <programlisting language="json"> @@ -45,8 +35,7 @@ </para> <para> - Running <command>bower2nix</command> will produce something like the - following output: + Running <command>bower2nix</command> will produce something like the following output: <programlisting language="nix"> <![CDATA[{ fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ @@ -58,15 +47,11 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ </para> <para> - Using the <command>bower2nix</command> command line arguments, the output - can be redirected to a file. A name like - <filename>bower-packages.nix</filename> would be fine. + Using the <command>bower2nix</command> command line arguments, the output can be redirected to a file. A name like <filename>bower-packages.nix</filename> would be fine. </para> <para> - The resulting derivation is a union of all the downloaded Bower packages - (and their dependencies). To use it, they still need to be linked together - by Bower, which is where <varname>buildBowerComponents</varname> is useful. + The resulting derivation is a union of all the downloaded Bower packages (and their dependencies). To use it, they still need to be linked together by Bower, which is where <varname>buildBowerComponents</varname> is useful. </para> </section> @@ -74,10 +59,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ <title><varname>buildBowerComponents</varname> function</title> <para> - The function is implemented in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix"> - <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>. - Example usage: + The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix"> <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>. Example usage: <example xml:id="ex-buildBowerComponents"> <title>buildBowerComponents</title> <programlisting language="nix"> @@ -91,34 +73,27 @@ bowerComponents = buildBowerComponents { </para> <para> - In <xref linkend="ex-buildBowerComponents" />, the following arguments are - of special significance to the function: + In <xref linkend="ex-buildBowerComponents" />, the following arguments are of special significance to the function: <calloutlist> <callout arearefs="ex-buildBowerComponents-1"> <para> - <varname>generated</varname> specifies the file which was created by - <command>bower2nix</command>. + <varname>generated</varname> specifies the file which was created by <command>bower2nix</command>. </para> </callout> <callout arearefs="ex-buildBowerComponents-2"> <para> - <varname>src</varname> is your project's sources. It needs to contain a - <filename>bower.json</filename> file. + <varname>src</varname> is your project's sources. It needs to contain a <filename>bower.json</filename> file. </para> </callout> </calloutlist> </para> <para> - <varname>buildBowerComponents</varname> will run Bower to link together the - output of <command>bower2nix</command>, resulting in a - <filename>bower_components</filename> directory which can be used. + <varname>buildBowerComponents</varname> will run Bower to link together the output of <command>bower2nix</command>, resulting in a <filename>bower_components</filename> directory which can be used. </para> <para> - Here is an example of a web frontend build process using - <command>gulp</command>. You might use <command>grunt</command>, or anything - else. + Here is an example of a web frontend build process using <command>gulp</command>. You might use <command>grunt</command>, or anything else. </para> <example xml:id="ex-bowerGulpFile"> @@ -174,21 +149,17 @@ pkgs.stdenv.mkDerivation { <calloutlist> <callout arearefs="ex-buildBowerComponentsDefault-1"> <para> - The result of <varname>buildBowerComponents</varname> is an input to the - frontend build. + The result of <varname>buildBowerComponents</varname> is an input to the frontend build. </para> </callout> <callout arearefs="ex-buildBowerComponentsDefault-2"> <para> - Whether to symlink or copy the <filename>bower_components</filename> - directory depends on the build tool in use. In this case a copy is used - to avoid <command>gulp</command> silliness with permissions. + Whether to symlink or copy the <filename>bower_components</filename> directory depends on the build tool in use. In this case a copy is used to avoid <command>gulp</command> silliness with permissions. </para> </callout> <callout arearefs="ex-buildBowerComponentsDefault-3"> <para> - <command>gulp</command> requires <varname>HOME</varname> to refer to a - writeable directory. + <command>gulp</command> requires <varname>HOME</varname> to refer to a writeable directory. </para> </callout> <callout arearefs="ex-buildBowerComponentsDefault-4"> @@ -210,17 +181,13 @@ pkgs.stdenv.mkDerivation { </term> <listitem> <para> - This means that Bower was looking for a package version which doesn't - exist in the generated <filename>bower-packages.nix</filename>. + This means that Bower was looking for a package version which doesn't exist in the generated <filename>bower-packages.nix</filename>. </para> <para> - If <filename>bower.json</filename> has been updated, then run - <command>bower2nix</command> again. + If <filename>bower.json</filename> has been updated, then run <command>bower2nix</command> again. </para> <para> - It could also be a bug in <command>bower2nix</command> or - <command>fetchbower</command>. If possible, try reformulating the version - specification in <filename>bower.json</filename>. + It could also be a bug in <command>bower2nix</command> or <command>fetchbower</command>. If possible, try reformulating the version specification in <filename>bower.json</filename>. </para> </listitem> </varlistentry> diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 4314df5c9df..86d9226166f 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -4,31 +4,19 @@ <title>Coq</title> <para> - Coq libraries should be installed in - <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such - directories are automatically added to the <literal>$COQPATH</literal> - environment variable by the hook defined in the Coq derivation. + Coq libraries should be installed in <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such directories are automatically added to the <literal>$COQPATH</literal> environment variable by the hook defined in the Coq derivation. </para> <para> - Some extensions (plugins) might require OCaml and sometimes other OCaml - packages. The <literal>coq.ocamlPackages</literal> attribute can be used to - depend on the same package set Coq was built against. + Some extensions (plugins) might require OCaml and sometimes other OCaml packages. The <literal>coq.ocamlPackages</literal> attribute can be used to depend on the same package set Coq was built against. </para> <para> - Coq libraries may be compatible with some specific versions of Coq only. The - <literal>compatibleCoqVersions</literal> attribute is used to precisely - select those versions of Coq that are compatible with this derivation. + Coq libraries may be compatible with some specific versions of Coq only. The <literal>compatibleCoqVersions</literal> attribute is used to precisely select those versions of Coq that are compatible with this derivation. </para> <para> - Here is a simple package example. It is a pure Coq library, thus it depends - on Coq. It builds on the Mathematical Components library, thus it also takes - <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its - <literal>Makefile</literal> has been generated using - <literal>coq_makefile</literal> so we only have to set the - <literal>$COQLIB</literal> variable at install time. + Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its <literal>Makefile</literal> has been generated using <literal>coq_makefile</literal> so we only have to set the <literal>$COQLIB</literal> variable at install time. </para> <programlisting> diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 42b4ae04322..9e0f21a6c74 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -5,53 +5,26 @@ <title>Packaging GNOME applications</title> <para> - Programs in the GNOME universe are written in various languages but they all - use GObject-based libraries like GLib, GTK or GStreamer. These libraries are - often modular, relying on looking into certain directories to find their - modules. However, due to Nix’s specific file system organization, this - will fail without our intervention. Fortunately, the libraries usually allow - overriding the directories through environment variables, either natively or - thanks to a patch in nixpkgs. - <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to - ensure correct paths are available to the application constitutes a - significant part of packaging a modern desktop application. In this section, - we will describe various modules needed by such applications, environment - variables needed to make the modules load, and finally a script that will do - the work for us. + Programs in the GNOME universe are written in various languages but they all use GObject-based libraries like GLib, GTK or GStreamer. These libraries are often modular, relying on looking into certain directories to find their modules. However, due to Nix’s specific file system organization, this will fail without our intervention. Fortunately, the libraries usually allow overriding the directories through environment variables, either natively or thanks to a patch in nixpkgs. <link xlink:href="#fun-wrapProgram">Wrapping</link> the executables to ensure correct paths are available to the application constitutes a significant part of packaging a modern desktop application. In this section, we will describe various modules needed by such applications, environment variables needed to make the modules load, and finally a script that will do the work for us. </para> <section xml:id="ssec-gnome-settings"> <title>Settings</title> <para> - <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link> - API is often used for storing settings. GSettings schemas are required, to - know the type and other metadata of the stored values. GLib looks for - <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the - directories of <envar>XDG_DATA_DIRS</envar>. + <link xlink:href="https://developer.gnome.org/gio/stable/GSettings.html">GSettings</link> API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for <filename>glib-2.0/schemas/gschemas.compiled</filename> files inside the directories of <envar>XDG_DATA_DIRS</envar>. </para> <para> - On Linux, GSettings API is implemented using - <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link> - backend. You will need to add <literal>dconf</literal> GIO module to - <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the - <literal>memory</literal> backend will be used and the saved settings will - not be persistent. + On Linux, GSettings API is implemented using <link xlink:href="https://wiki.gnome.org/Projects/dconf">dconf</link> backend. You will need to add <literal>dconf</literal> GIO module to <envar>GIO_EXTRA_MODULES</envar> variable, otherwise the <literal>memory</literal> backend will be used and the saved settings will not be persistent. </para> <para> - Last you will need the dconf database D-Bus service itself. You can enable - it using <option>programs.dconf.enable</option>. + Last you will need the dconf database D-Bus service itself. You can enable it using <option>programs.dconf.enable</option>. </para> <para> - Some applications will also require - <package>gsettings-desktop-schemas</package> for things like reading proxy - configuration or user interface customization. This dependency is often not - mentioned by upstream, you should grep for - <literal>org.gnome.desktop</literal> and - <literal>org.gnome.system</literal> to see if the schemas are needed. + Some applications will also require <package>gsettings-desktop-schemas</package> for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for <literal>org.gnome.desktop</literal> and <literal>org.gnome.system</literal> to see if the schemas are needed. </para> </section> @@ -59,16 +32,7 @@ <title>Icons</title> <para> - When an application uses icons, an icon theme should be available in - <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less - <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> - contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup - hook</link> that will pick up icon themes from - <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, - relying on that would mean every user has to download the theme included in - the package expression no matter their preference. For that reason, we - leave the installation of icon theme on the user. If you use one of the - desktop environments, you probably already have an icon theme installed. + When an application uses icons, an icon theme should be available in <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup hook</link> that will pick up icon themes from <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed. </para> </section> @@ -76,12 +40,7 @@ <title>GTK Themes</title> <para> - Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This - is no longer necessary for most programs since GTK incorporated Adwaita - theme. Some programs (for example, those designed for - <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary - HIG</link>) might require a special theme like - <package>pantheon.elementary-gtk-theme</package>. + Previously, a GTK theme needed to be in <envar>XDG_DATA_DIRS</envar>. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for <link xlink:href="https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines">elementary HIG</link>) might require a special theme like <package>pantheon.elementary-gtk-theme</package>. </para> </section> @@ -89,10 +48,7 @@ <title>GObject introspection typelibs</title> <para> - <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject - introspection</link> allows applications to use C libraries in other - languages easily. It does this through <literal>typelib</literal> files - searched in <envar>GI_TYPELIB_PATH</envar>. + <link xlink:href="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject introspection</link> allows applications to use C libraries in other languages easily. It does this through <literal>typelib</literal> files searched in <envar>GI_TYPELIB_PATH</envar>. </para> </section> @@ -100,11 +56,7 @@ <title>Various plug-ins</title> <para> - If your application uses - <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or - <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you - should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and - <envar>GRL_PLUGIN_PATH</envar>, respectively. + If your application uses <link xlink:href="https://gstreamer.freedesktop.org/">GStreamer</link> or <link xlink:href="https://wiki.gnome.org/Projects/Grilo">Grilo</link>, you should set <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar>, respectively. </para> </section> </section> @@ -113,8 +65,7 @@ <title>Onto <package>wrapGAppsHook</package></title> <para> - Given the requirements above, the package expression would become messy - quickly: + Given the requirements above, the package expression would become messy quickly: <programlisting> preFixup = '' for f in $(find $out/bin/ $out/libexec/ -type f -executable); do @@ -128,76 +79,48 @@ preFixup = '' done ''; </programlisting> - Fortunately, there is <package>wrapGAppsHook</package>, that does the - wrapping for us. In particular, it works in conjunction with other setup - hooks that will populate the variable: + Fortunately, there is <package>wrapGAppsHook</package>, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable: <itemizedlist> <listitem xml:id="ssec-gnome-hooks-wrapgappshook"> <para> - <package>wrapGAppsHook</package> itself will add the package’s - <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>. + <package>wrapGAppsHook</package> itself will add the package’s <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>. </para> </listitem> <listitem xml:id="ssec-gnome-hooks-glib"> <para> - <package>glib</package> setup hook will populate - <envar>GSETTINGS_SCHEMAS_PATH</envar> and then - <package>wrapGAppsHook</package> will prepend it to - <envar>XDG_DATA_DIRS</envar>. + <package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>. </para> </listitem> <listitem xml:id="ssec-gnome-hooks-dconf"> <para> - <package>gnome3.dconf.lib</package> is a dependency of - <package>wrapGAppsHook</package>, which then also adds it to the - <envar>GIO_EXTRA_MODULES</envar> variable. + <package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable. </para> </listitem> <listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme"> <para> - <package>hicolor-icon-theme</package>’s setup hook will add icon themes - to <envar>XDG_ICON_DIRS</envar> which is prepended to - <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>. + <package>hicolor-icon-theme</package>’s setup hook will add icon themes to <envar>XDG_ICON_DIRS</envar> which is prepended to <envar>XDG_DATA_DIRS</envar> by <package>wrapGAppsHook</package>. </para> </listitem> <listitem xml:id="ssec-gnome-hooks-gobject-introspection"> <para> - <package>gobject-introspection</package> setup hook populates - <envar>GI_TYPELIB_PATH</envar> variable with - <filename>lib/girepository-1.0</filename> directories of dependencies, - which is then added to wrapper by <package>wrapGAppsHook</package>. It - also adds <filename>share</filename> directories of dependencies to - <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but - it also - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes - the closures</link> of packages using <package>wrapGAppsHook</package>. + <package>gobject-introspection</package> setup hook populates <envar>GI_TYPELIB_PATH</envar> variable with <filename>lib/girepository-1.0</filename> directories of dependencies, which is then added to wrapper by <package>wrapGAppsHook</package>. It also adds <filename>share</filename> directories of dependencies to <envar>XDG_DATA_DIRS</envar>, which is intended to promote GIR files but it also <link xlink:href="https://github.com/NixOS/nixpkgs/issues/32790">pollutes the closures</link> of packages using <package>wrapGAppsHook</package>. </para> <warning> <para> - The setup hook - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link> - does not work in expressions with <literal>strictDeps</literal> enabled, - like Python packages. In those cases, you will need to disable it with - <code>strictDeps = false;</code>. + The setup hook <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56943">currently</link> does not work in expressions with <literal>strictDeps</literal> enabled, like Python packages. In those cases, you will need to disable it with <code>strictDeps = false;</code>. </para> </warning> </listitem> <listitem xml:id="ssec-gnome-hooks-gst-grl-plugins"> <para> - Setup hooks of <package>gst_all_1.gstreamer</package> and - <package>gnome3.grilo</package> will populate the - <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and - <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then - be added to the wrapper by <literal>wrapGAppsHook</literal>. + Setup hooks of <package>gst_all_1.gstreamer</package> and <package>gnome3.grilo</package> will populate the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> and <envar>GRL_PLUGIN_PATH</envar> variables, respectively, which will then be added to the wrapper by <literal>wrapGAppsHook</literal>. </para> </listitem> </itemizedlist> </para> <para> - You can also pass additional arguments to <literal>makeWrapper</literal> - using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal> - hook: + You can also pass additional arguments to <literal>makeWrapper</literal> using <literal>gappsWrapperArgs</literal> in <literal>preFixup</literal> hook: <programlisting> preFixup = '' gappsWrapperArgs+=( @@ -215,13 +138,7 @@ preFixup = '' <title>Updating GNOME packages</title> <para> - Most GNOME package offer - <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>, - it is therefore possible to update to latest source tarball by running - <command>nix-shell maintainers/scripts/update.nix --argstr package - gnome3.nautilus</command> or even en masse with <command>nix-shell - maintainers/scripts/update.nix --argstr path gnome3</command>. Read the - package’s <filename>NEWS</filename> file to see what changed. + Most GNOME package offer <link linkend="var-passthru-updateScript"><literal>updateScript</literal></link>, it is therefore possible to update to latest source tarball by running <command>nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus</command> or even en masse with <command>nix-shell maintainers/scripts/update.nix --argstr path gnome3</command>. Read the package’s <filename>NEWS</filename> file to see what changed. </para> </section> @@ -235,17 +152,7 @@ preFixup = '' </term> <listitem> <para> - There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>. - Temporarily add a random package containing schemas like - <package>gsettings-desktop-schemas</package> to - <literal>buildInputs</literal>. - <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and - <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> - setup hooks will take care of making the schemas available to application - and you will see the actual missing schemas with the - <link linkend="ssec-gnome-common-issues-missing-schema">next - error</link>. Or you can try looking through the source code for the - actual schemas used. + There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>. Temporarily add a random package containing schemas like <package>gsettings-desktop-schemas</package> to <literal>buildInputs</literal>. <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the <link linkend="ssec-gnome-common-issues-missing-schema">next error</link>. Or you can try looking through the source code for the actual schemas used. </para> </listitem> </varlistentry> @@ -255,11 +162,7 @@ preFixup = '' </term> <listitem> <para> - Package is missing some GSettings schemas. You can find out the package - containing the schema with <command>nix-locate - <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let - the hooks handle the wrapping as - <link linkend="ssec-gnome-common-issues-no-schemas">above</link>. + Package is missing some GSettings schemas. You can find out the package containing the schema with <command>nix-locate <replaceable>org.gnome.foo</replaceable>.gschema.xml</command> and let the hooks handle the wrapping as <link linkend="ssec-gnome-common-issues-no-schemas">above</link>. </para> </listitem> </varlistentry> @@ -269,14 +172,7 @@ preFixup = '' </term> <listitem> <para> - This is because derivers like - <function>python.pkgs.buildPythonApplication</function> or - <function>qt5.mkDerivation</function> have setup-hooks automatically - added that produce wrappers with <package>makeWrapper</package>. The - simplest way to workaround that is to disable the - <package>wrapGAppsHook</package> automatic wrapping with - <code>dontWrapGApps = true;</code> and pass the arguments it intended to - pass to <package>makeWrapper</package> to another. + This is because derivers like <function>python.pkgs.buildPythonApplication</function> or <function>qt5.mkDerivation</function> have setup-hooks automatically added that produce wrappers with <package>makeWrapper</package>. The simplest way to workaround that is to disable the <package>wrapGAppsHook</package> automatic wrapping with <code>dontWrapGApps = true;</code> and pass the arguments it intended to pass to <package>makeWrapper</package> to another. </para> <para> In the case of a Python application it could look like: @@ -328,55 +224,34 @@ mkDerivation { </term> <listitem> <para> - You can rely on applications depending on the library set the necessary - environment variables but that it often easy to miss. Instead we - recommend to patch the paths in the source code whenever possible. Here - are some examples: + You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: <itemizedlist> <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext"> <para> - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing - a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> – - we are using <function>substituteAll</function> to include the path to - a typelib into a patch. + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24">Replacing a <envar>GI_TYPELIB_PATH</envar> in GNOME Shell extension</link> – we are using <function>substituteAll</function> to include the path to a typelib into a patch. </para> </listitem> <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings"> <para> - The following examples are hardcoding GSettings schema paths. To get - the schema paths we use the functions + The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions <itemizedlist> <listitem> <para> - <function>glib.getSchemaPath</function> Takes a nix package - attribute as an argument. + <function>glib.getSchemaPath</function> Takes a nix package attribute as an argument. </para> </listitem> <listitem> <para> - <function>glib.makeSchemaPath</function> Takes a package output - like <literal>$out</literal> and a derivation name. You should use - this if the schemas you need to hardcode are in the same - derivation. + <function>glib.makeSchemaPath</function> Takes a package output like <literal>$out</literal> and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation. </para> </listitem> </itemizedlist> </para> <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-vala"> - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding - GSettings schema path in Vala plug-in (dynamically loaded - library)</link> – here, <function>substituteAll</function> cannot be - used since the schema comes from the same package preventing us from - pass its path to the function, probably due to a - <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix - bug</link>. + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86">Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)</link> – here, <function>substituteAll</function> cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a <link xlink:href="https://github.com/NixOS/nix/issues/1846">Nix bug</link>. </para> <para xml:id="ssec-gnome-common-issues-unwrappable-package-gsettings-c"> - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding - GSettings schema path in C library</link> – nothing special other - than using - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle - patch</link> to generate the patch itself. + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34">Hard-coding GSettings schema path in C library</link> – nothing special other than using <link xlink:href="https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467">Coccinelle patch</link> to generate the patch itself. </para> </listitem> </itemizedlist> diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index b2b4962cb5f..288a9029863 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -7,21 +7,16 @@ <title>Go modules</title> <para> - The function <varname> buildGoModule </varname> builds Go programs managed - with Go modules. It builds a - <link xlink:href="https://github.com/golang/go/wiki/Modules">Go - modules</link> through a two phase build: + The function <varname> buildGoModule </varname> builds Go programs managed with Go modules. It builds a <link xlink:href="https://github.com/golang/go/wiki/Modules">Go modules</link> through a two phase build: <itemizedlist> <listitem> <para> - An intermediate fetcher derivation. This derivation will be used to fetch - all of the dependencies of the Go module. + An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. </para> </listitem> <listitem> <para> - A final derivation will use the output of the intermediate derivation to - build the binaries and produce the final output. + A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. </para> </listitem> </itemizedlist> @@ -57,21 +52,16 @@ pet = buildGoModule rec { </example> <para> - <xref linkend='ex-buildGoModule'/> is an example expression using - buildGoModule, the following arguments are of special significance to the - function: + <xref linkend='ex-buildGoModule'/> is an example expression using buildGoModule, the following arguments are of special significance to the function: <calloutlist> <callout arearefs='ex-buildGoModule-1'> <para> - <varname>modSha256</varname> is the hash of the output of the - intermediate fetcher derivation. + <varname>modSha256</varname> is the hash of the output of the intermediate fetcher derivation. </para> </callout> <callout arearefs='ex-buildGoModule-2'> <para> - <varname>subPackages</varname> limits the builder from building child - packages that have not been listed. If <varname>subPackages</varname> is - not specified, all child packages will be built. + <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built. </para> </callout> </calloutlist> @@ -82,8 +72,7 @@ pet = buildGoModule rec { <title>Go legacy</title> <para> - The function <varname> buildGoPackage </varname> builds legacy Go programs, - not supporting Go modules. + The function <varname> buildGoPackage </varname> builds legacy Go programs, not supporting Go modules. </para> <example xml:id='ex-buildGoPackage'> @@ -111,49 +100,36 @@ deis = buildGoPackage rec { </example> <para> - <xref linkend='ex-buildGoPackage'/> is an example expression using - buildGoPackage, the following arguments are of special significance to the - function: + <xref linkend='ex-buildGoPackage'/> is an example expression using buildGoPackage, the following arguments are of special significance to the function: <calloutlist> <callout arearefs='ex-buildGoPackage-1'> <para> - <varname>goPackagePath</varname> specifies the package's canonical Go - import path. + <varname>goPackagePath</varname> specifies the package's canonical Go import path. </para> </callout> <callout arearefs='ex-buildGoPackage-2'> <para> - <varname>subPackages</varname> limits the builder from building child - packages that have not been listed. If <varname>subPackages</varname> is - not specified, all child packages will be built. + <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built. </para> <para> - In this example only <literal>github.com/deis/deis/client</literal> will - be built. + In this example only <literal>github.com/deis/deis/client</literal> will be built. </para> </callout> <callout arearefs='ex-buildGoPackage-3'> <para> - <varname>goDeps</varname> is where the Go dependencies of a Go program - are listed 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. + <varname>goDeps</varname> is where the Go dependencies of a Go program are listed 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> <callout arearefs='ex-buildGoPackage-4'> <para> - <varname>buildFlags</varname> is a list of flags passed to the go build - command. + <varname>buildFlags</varname> is a list of flags passed to the go build command. </para> </callout> </calloutlist> </para> <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>. + 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'> @@ -196,27 +172,18 @@ deis = buildGoPackage rec { </callout> <callout arearefs='ex-goDeps-3'> <para> - <varname>fetch type</varname> that needs to be used to get package - source. If <varname>git</varname> is used there should be - <varname>url</varname>, <varname>rev</varname> and - <varname>sha256</varname> defined next to it. + <varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname> is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname> defined next to it. </para> </callout> </calloutlist> </para> <para> - To extract dependency information from a Go package in automated way use - <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can - produce complete derivation and <varname>goDeps</varname> file for Go - programs. + To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can produce complete derivation and <varname>goDeps</varname> file for Go programs. </para> <para> - <varname>buildGoPackage</varname> produces - <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where - <varname>bin</varname> includes program binaries. You can test build a Go - binary as follows: + <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows: <screen> <prompt>$ </prompt>nix-build -A deis.bin </screen> @@ -224,13 +191,11 @@ deis = buildGoPackage rec { <screen> <prompt>$ </prompt>nix-build -A deis.all </screen> - <varname>bin</varname> output will be installed by default with - <varname>nix-env -i</varname> or <varname>systemPackages</varname>. + <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> or <varname>systemPackages</varname>. </para> <para> - You may use Go packages installed into the active Nix profiles by adding the - following to your ~/.bashrc: + You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: <screen> for p in $NIX_PROFILES; do GOPATH="$p/share/go:$GOPATH" diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 5836294b774..cd0b48adb14 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -3,12 +3,7 @@ xml:id="chap-language-support"> <title>Support for specific programming languages and frameworks</title> <para> - The <link linkend="chap-stdenv">standard build environment</link> makes it - easy to build typical Autotools-based packages with very little code. Any - other kind of package can be accomodated by overriding the appropriate phases - of <literal>stdenv</literal>. However, there are specialised functions in - Nixpkgs to easily build packages for other programming languages, such as - Perl or Haskell. These are described in this chapter. + The <link linkend="chap-stdenv">standard build environment</link> makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of <literal>stdenv</literal>. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. </para> <xi:include href="android.section.xml" /> <xi:include href="beam.xml" /> diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 68a1a097984..bf0fc488392 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -15,37 +15,24 @@ stdenv.mkDerivation { buildPhase = "ant"; } </programlisting> - Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built - where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in - Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the - (unfree) <literal>oraclejdk</literal>. + Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the (unfree) <literal>oraclejdk</literal>. </para> <para> - JAR files that are intended to be used by other packages should be installed - in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that - add any JARs in the <filename>share/java</filename> directories of the build - inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if - the package <literal>libfoo</literal> installs a JAR named - <filename>foo.jar</filename> in its <filename>share/java</filename> - directory, and another package declares the attribute + JAR files that are intended to be used by other packages should be installed in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that add any JARs in the <filename>share/java</filename> directories of the build inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if the package <literal>libfoo</literal> installs a JAR named <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute <programlisting> buildInputs = [ libfoo ]; nativeBuildInputs = [ jdk ]; </programlisting> - then <envar>CLASSPATH</envar> will be set to - <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>. + then <envar>CLASSPATH</envar> will be set to <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>. </para> <para> - Private JARs should be installed in a location like - <filename>$out/share/<replaceable>package-name</replaceable></filename>. + Private JARs should be installed in a location like <filename>$out/share/<replaceable>package-name</replaceable></filename>. </para> <para> - If your Java package provides a program, you need to generate a wrapper - script to run it using the OpenJRE. You can use - <literal>makeWrapper</literal> for this: + If your Java package provides a program, you need to generate a wrapper script to run it using the OpenJRE. You can use <literal>makeWrapper</literal> for this: <programlisting> nativeBuildInputs = [ makeWrapper ]; @@ -56,30 +43,21 @@ installPhase = --add-flags "-cp $out/share/java/foo.jar org.foo.Main" ''; </programlisting> - Note the use of <literal>jre</literal>, which is the part of the OpenJDK - package that contains the Java Runtime Environment. By using - <literal>${jre}/bin/java</literal> instead of - <literal>${jdk}/bin/java</literal>, you prevent your package from depending - on the JDK at runtime. + Note the use of <literal>jre</literal>, which is the part of the OpenJDK package that contains the Java Runtime Environment. By using <literal>${jre}/bin/java</literal> instead of <literal>${jdk}/bin/java</literal>, you prevent your package from depending on the JDK at runtime. </para> <para> - Note all JDKs passthru <literal>home</literal>, so if your application - requires environment variables like <envar>JAVA_HOME</envar> being set, that - can be done in a generic fashion with the <literal>--set</literal> argument - of <literal>makeWrapper</literal>: + Note all JDKs passthru <literal>home</literal>, so if your application requires environment variables like <envar>JAVA_HOME</envar> being set, that can be done in a generic fashion with the <literal>--set</literal> argument of <literal>makeWrapper</literal>: <programlisting> --set JAVA_HOME ${jdk.home} </programlisting> </para> <para> - It is possible to use a different Java compiler than <command>javac</command> - from the OpenJDK. For instance, to use the GNU Java Compiler: + It is possible to use a different Java compiler than <command>javac</command> from the OpenJDK. For instance, to use the GNU Java Compiler: <programlisting> nativeBuildInputs = [ gcj ant ]; </programlisting> - Here, Ant will automatically use <command>gij</command> (the GNU Java - Runtime) instead of the OpenJRE. + Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE. </para> </section> diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml index 5144bb24ff6..bcca6b73753 100644 --- a/doc/languages-frameworks/lua.xml +++ b/doc/languages-frameworks/lua.xml @@ -4,18 +4,11 @@ <title>Lua</title> <para> - Lua packages are built by the <varname>buildLuaPackage</varname> function. - This function is implemented in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix"> - <filename>pkgs/development/lua-modules/generic/default.nix</filename></link> - and works similarly to <varname>buildPerlPackage</varname>. (See - <xref linkend="sec-language-perl"/> for details.) + Lua packages are built by the <varname>buildLuaPackage</varname> function. This function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix"> <filename>pkgs/development/lua-modules/generic/default.nix</filename></link> and works similarly to <varname>buildPerlPackage</varname>. (See <xref linkend="sec-language-perl"/> for details.) </para> <para> - Lua packages are defined in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>. - Most of them are simple. For example: + Lua packages are defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>. Most of them are simple. For example: <programlisting> fileSystem = buildLuaPackage { name = "filesystem-1.6.2"; @@ -33,16 +26,11 @@ fileSystem = buildLuaPackage { </para> <para> - Though, more complicated package should be placed in a seperate file in - <link + Though, more complicated package should be placed in a seperate file in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>. </para> <para> - Lua packages accept additional parameter <varname>disabled</varname>, which - defines the condition of disabling package from luaPackages. For example, if - package has <varname>disabled</varname> assigned to <literal>lua.luaversion - != "5.1"</literal>, it will not be included in any luaPackages except - lua51Packages, making it only be built for lua 5.1. + Lua packages accept additional parameter <varname>disabled</varname>, which defines the condition of disabling package from luaPackages. For example, if package has <varname>disabled</varname> assigned to <literal>lua.luaversion != "5.1"</literal>, it will not be included in any luaPackages except lua51Packages, making it only be built for lua 5.1. </para> </section> diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml index b7006ecba99..a0ea209b493 100644 --- a/doc/languages-frameworks/ocaml.xml +++ b/doc/languages-frameworks/ocaml.xml @@ -4,35 +4,15 @@ <title>OCaml</title> <para> - OCaml libraries should be installed in - <literal>$(out)/lib/ocaml/${ocaml.version}/site-lib/</literal>. Such - directories are automatically added to the <literal>$OCAMLPATH</literal> - environment variable when building another package that depends on them or - when opening a <literal>nix-shell</literal>. + OCaml libraries should be installed in <literal>$(out)/lib/ocaml/${ocaml.version}/site-lib/</literal>. Such directories are automatically added to the <literal>$OCAMLPATH</literal> environment variable when building another package that depends on them or when opening a <literal>nix-shell</literal>. </para> <para> - Given that most of the OCaml ecosystem is now built with dune, nixpkgs - includes a convenience build support function called - <literal>buildDunePackage</literal> that will build an OCaml package using - dune, OCaml and findlib and any additional dependencies provided as - <literal>buildInputs</literal> or <literal>propagatedBuildInputs</literal>. + Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes a convenience build support function called <literal>buildDunePackage</literal> that will build an OCaml package using dune, OCaml and findlib and any additional dependencies provided as <literal>buildInputs</literal> or <literal>propagatedBuildInputs</literal>. </para> <para> - Here is a simple package example. It defines an (optional) attribute - <literal>minimumOCamlVersion</literal> that will be used to throw a - descriptive evaluation error if building with an older OCaml is attempted. It - uses the <literal>fetchFromGitHub</literal> fetcher to get its source. It - sets the <literal>doCheck</literal> (optional) attribute to - <literal>true</literal> which means that tests will be run with <literal>dune - runtest -p angstrom</literal> after the build (<literal>dune build -p - angstrom</literal>) is complete. It uses <literal>alcotest</literal> as a - build input (because it is needed to run the tests) and - <literal>bigstringaf</literal> and <literal>result</literal> as propagated - build inputs (thus they will also be available to libraries depending on this - library). The library will be installed using the - <literal>angstrom.install</literal> file that dune generates. + Here is a simple package example. It defines an (optional) attribute <literal>minimumOCamlVersion</literal> that will be used to throw a descriptive evaluation error if building with an older OCaml is attempted. It uses the <literal>fetchFromGitHub</literal> fetcher to get its source. It sets the <literal>doCheck</literal> (optional) attribute to <literal>true</literal> which means that tests will be run with <literal>dune runtest -p angstrom</literal> after the build (<literal>dune build -p angstrom</literal>) is complete. It uses <literal>alcotest</literal> as a build input (because it is needed to run the tests) and <literal>bigstringaf</literal> and <literal>result</literal> as propagated build inputs (thus they will also be available to libraries depending on this library). The library will be installed using the <literal>angstrom.install</literal> file that dune generates. </para> <programlisting> @@ -65,11 +45,7 @@ buildDunePackage rec { </programlisting> <para> - Here is a second example, this time using a source archive generated with - <literal>dune-release</literal>. It is a good idea to use this archive when - it is available as it will usually contain substituted variables such as a - <literal>%%VERSION%%</literal> field. This library does not depend on any - other OCaml library and no tests are run after building it. + Here is a second example, this time using a source archive generated with <literal>dune-release</literal>. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a <literal>%%VERSION%%</literal> field. This library does not depend on any other OCaml library and no tests are run after building it. </para> <programlisting> diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index d5911cf67fd..d9b6b2721c6 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -4,24 +4,13 @@ <title>Perl</title> <para> - Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic - package builder function for any Perl package that has a standard - <varname>Makefile.PL</varname>. It’s implemented in - <link + Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic package builder function for any Perl package that has a standard <varname>Makefile.PL</varname>. It’s implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>. </para> <para> - Perl packages from CPAN are defined in - <link -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, - rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages - are so straight-forward to build that they are defined here directly, rather - than having a separate function for each package called from - <filename>perl-packages.nix</filename>. However, more complicated packages - should be put in a separate file, typically in - <filename>pkgs/development/perl-modules</filename>. Here is an example of the - former: + Perl packages from CPAN are defined in <link +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from <filename>perl-packages.nix</filename>. However, more complicated packages should be put in a separate file, typically in <filename>pkgs/development/perl-modules</filename>. Here is an example of the former: <programlisting> ClassC3 = buildPerlPackage rec { name = "Class-C3-0.21"; @@ -31,32 +20,22 @@ ClassC3 = buildPerlPackage rec { }; }; </programlisting> - Note the use of <literal>mirror://cpan/</literal>, and the - <literal>${name}</literal> in the URL definition to ensure that the name - attribute is consistent with the source that we’re actually downloading. - Perl packages are made available in <filename>all-packages.nix</filename> - through the variable <varname>perlPackages</varname>. For instance, if you - have a package that needs <varname>ClassC3</varname>, you would typically - write + Note the use of <literal>mirror://cpan/</literal>, and the <literal>${name}</literal> in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in <filename>all-packages.nix</filename> through the variable <varname>perlPackages</varname>. For instance, if you have a package that needs <varname>ClassC3</varname>, you would typically write <programlisting> foo = import ../path/to/foo.nix { inherit stdenv fetchurl ...; inherit (perlPackages) ClassC3; }; </programlisting> - in <filename>all-packages.nix</filename>. You can test building a Perl - package as follows: + in <filename>all-packages.nix</filename>. You can test building a Perl package as follows: <screen> <prompt>$ </prompt>nix-build -A perlPackages.ClassC3 </screen> - <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the - start of the name attribute, so the package above is actually called - <literal>perl-Class-C3-0.21</literal>. So to install it, you can say: + <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the start of the name attribute, so the package above is actually called <literal>perl-Class-C3-0.21</literal>. So to install it, you can say: <screen> <prompt>$ </prompt>nix-env -i perl-Class-C3 </screen> - (Of course you can also install using the attribute name: <literal>nix-env -i - -A perlPackages.ClassC3</literal>.) + (Of course you can also install using the attribute name: <literal>nix-env -i -A perlPackages.ClassC3</literal>.) </para> <para> @@ -64,40 +43,24 @@ foo = import ../path/to/foo.nix { <orderedlist> <listitem> <para> - In the configure phase, it calls <literal>perl Makefile.PL</literal> to - generate a Makefile. You can set the variable - <varname>makeMakerFlags</varname> to pass flags to - <filename>Makefile.PL</filename> + In the configure phase, it calls <literal>perl Makefile.PL</literal> to generate a Makefile. You can set the variable <varname>makeMakerFlags</varname> to pass flags to <filename>Makefile.PL</filename> </para> </listitem> <listitem> <para> - It adds the contents of the <envar>PERL5LIB</envar> environment variable - to <literal>#! .../bin/perl</literal> line of Perl scripts as - <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures - that a script can find its dependencies. (This can cause this shebang line - to become too long for Darwin to handle; see the note below.) + It adds the contents of the <envar>PERL5LIB</envar> environment variable to <literal>#! .../bin/perl</literal> line of Perl scripts as <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.) </para> </listitem> <listitem> <para> - In the fixup phase, it writes the propagated build inputs - (<varname>propagatedBuildInputs</varname>) to the file - <filename>$out/nix-support/propagated-user-env-packages</filename>. - <command>nix-env</command> recursively installs all packages listed in - this file when you install a package that has it. This ensures that a Perl - package can find its dependencies. + In the fixup phase, it writes the propagated build inputs (<varname>propagatedBuildInputs</varname>) to the file <filename>$out/nix-support/propagated-user-env-packages</filename>. <command>nix-env</command> recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies. </para> </listitem> </orderedlist> </para> <para> - <varname>buildPerlPackage</varname> is built on top of - <varname>stdenv</varname>, so everything can be customised in the usual way. - For instance, the <literal>BerkeleyDB</literal> module has a - <varname>preConfigure</varname> hook to generate a configuration file used by - <filename>Makefile.PL</filename>: + <varname>buildPerlPackage</varname> is built on top of <varname>stdenv</varname>, so everything can be customised in the usual way. For instance, the <literal>BerkeleyDB</literal> module has a <varname>preConfigure</varname> hook to generate a configuration file used by <filename>Makefile.PL</filename>: <programlisting> { buildPerlPackage, fetchurl, db }: @@ -118,12 +81,7 @@ buildPerlPackage rec { </para> <para> - Dependencies on other Perl packages can be specified in the - <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname> - attributes. If something is exclusively a build-time dependency, use - <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use - <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl - module that has runtime dependencies on a bunch of other modules: + Dependencies on other Perl packages can be specified in the <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname> attributes. If something is exclusively a build-time dependency, use <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: <programlisting> ClassC3Componentised = buildPerlPackage rec { name = "Class-C3-Componentised-1.0004"; @@ -139,11 +97,7 @@ ClassC3Componentised = buildPerlPackage rec { </para> <para> - On Darwin, if a script has too many - <literal>-I<replaceable>dir</replaceable></literal> flags in its first line - (its “shebang line”), it will not run. This can be worked around by - calling the <literal>shortenPerlShebang</literal> function from the - <literal>postInstall</literal> phase: + On Darwin, if a script has too many <literal>-I<replaceable>dir</replaceable></literal> flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the <literal>shortenPerlShebang</literal> function from the <literal>postInstall</literal> phase: <programlisting> { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: @@ -162,20 +116,14 @@ ImageExifTool = buildPerlPackage { ''; }; </programlisting> - This will remove the <literal>-I</literal> flags from the shebang line, - rewrite them in the <literal>use lib</literal> form, and put them on the next - line instead. This function can be given any number of Perl scripts as - arguments; it will modify them in-place. + This will remove the <literal>-I</literal> flags from the shebang line, rewrite them in the <literal>use lib</literal> form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. </para> <section xml:id="ssec-generation-from-CPAN"> <title>Generation from CPAN</title> <para> - Nix expressions for Perl packages can be generated (almost) automatically - from CPAN. This is done by the program - <command>nix-generate-from-cpan</command>, which can be installed as - follows: + Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program <command>nix-generate-from-cpan</command>, which can be installed as follows: </para> <screen> @@ -183,9 +131,7 @@ ImageExifTool = buildPerlPackage { </screen> <para> - This program takes a Perl module name, looks it up on CPAN, fetches and - unpacks the corresponding package, and prints a Nix expression on standard - output. For example: + This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example: <screen> <prompt>$ </prompt>nix-generate-from-cpan XML::Simple XMLSimple = buildPerlPackage rec { @@ -201,9 +147,7 @@ ImageExifTool = buildPerlPackage { }; }; </screen> - The output can be pasted into - <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you - need it. + The output can be pasted into <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you need it. </para> </section> @@ -211,13 +155,7 @@ ImageExifTool = buildPerlPackage { <title>Cross-compiling modules</title> <para> - Nixpkgs has experimental support for cross-compiling Perl modules. In many - cases, it will just work out of the box, even for modules with native - extensions. Sometimes, however, the Makefile.PL for a module may - (indirectly) import a native module. In that case, you will need to make a - stub for that module that will satisfy the Makefile.PL and install it into - <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the - <varname>postInstall</varname> for <varname>DBI</varname> for an example. + Nixpkgs has experimental support for cross-compiling Perl modules. In many cases, it will just work out of the box, even for modules with native extensions. Sometimes, however, the Makefile.PL for a module may (indirectly) import a native module. In that case, you will need to make a stub for that module that will satisfy the Makefile.PL and install it into <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the <varname>postInstall</varname> for <varname>DBI</varname> for an example. </para> </section> </section> diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index d6f3314ab08..8d97de504ad 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -4,11 +4,7 @@ <title>Qt</title> <para> - This section describes the differences between Nix expressions for Qt - libraries and applications and Nix expressions for other C++ software. Some - knowledge of the latter is assumed. There are primarily two problems which - the Qt infrastructure is designed to address: ensuring consistent versioning - of all dependencies and finding dependencies at runtime. + This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. </para> <example xml:id='qt-default-nix'> @@ -28,38 +24,26 @@ mkDerivation { <co xml:id='qt-default-nix-co-2' /> <calloutlist> <callout arearefs='qt-default-nix-co-1'> <para> - Import <literal>mkDerivation</literal> and Qt (such as - <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis> - import Qt package sets; the Qt versions of dependencies may not be - coherent, causing build and runtime failures. + Import <literal>mkDerivation</literal> and Qt (such as <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis> import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. </para> </callout> <callout arearefs='qt-default-nix-co-2'> <para> - Use <literal>mkDerivation</literal> instead of - <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is - a wrapper around <literal>stdenv.mkDerivation</literal> which applies some - Qt-specific settings. This deriver accepts the same arguments as - <literal>stdenv.mkDerivation</literal>; refer to - <xref linkend='chap-stdenv' /> for details. + Use <literal>mkDerivation</literal> instead of <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is a wrapper around <literal>stdenv.mkDerivation</literal> which applies some Qt-specific settings. This deriver accepts the same arguments as <literal>stdenv.mkDerivation</literal>; refer to <xref linkend='chap-stdenv' /> for details. </para> <para> - To use another deriver instead of <literal>stdenv.mkDerivation</literal>, - use <literal>mkDerivationWith</literal>: + To use another deriver instead of <literal>stdenv.mkDerivation</literal>, use <literal>mkDerivationWith</literal>: <programlisting> mkDerivationWith myDeriver { # ... } </programlisting> - If you cannot use <literal>mkDerivationWith</literal>, please refer to - <xref linkend='qt-runtime-dependencies' />. + If you cannot use <literal>mkDerivationWith</literal>, please refer to <xref linkend='qt-runtime-dependencies' />. </para> </callout> <callout arearefs='qt-default-nix-co-3'> <para> - <literal>mkDerivation</literal> accepts the same arguments as - <literal>stdenv.mkDerivation</literal>, such as - <literal>buildInputs</literal>. + <literal>mkDerivation</literal> accepts the same arguments as <literal>stdenv.mkDerivation</literal>, such as <literal>buildInputs</literal>. </para> </callout> </calloutlist> @@ -67,10 +51,7 @@ mkDerivationWith myDeriver { <formalpara xml:id='qt-runtime-dependencies'> <title>Locating runtime dependencies</title> <para> - Qt applications need to be wrapped to find runtime dependencies. If you - cannot use <literal>mkDerivation</literal> or - <literal>mkDerivationWith</literal> above, include - <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>: + Qt applications need to be wrapped to find runtime dependencies. If you cannot use <literal>mkDerivation</literal> or <literal>mkDerivationWith</literal> above, include <literal>wrapQtAppsHook</literal> in <literal>nativeBuildInputs</literal>: <programlisting> stdenv.mkDerivation { # ... @@ -82,9 +63,7 @@ stdenv.mkDerivation { </formalpara> <para> - Entries added to <literal>qtWrapperArgs</literal> are used to modify the - wrappers created by <literal>wrapQtAppsHook</literal>. The entries are passed - as arguments to <xref linkend='fun-wrapProgram' />. + Entries added to <literal>qtWrapperArgs</literal> are used to modify the wrappers created by <literal>wrapQtAppsHook</literal>. The entries are passed as arguments to <xref linkend='fun-wrapProgram' />. <programlisting> mkDerivation { # ... @@ -95,10 +74,7 @@ mkDerivation { </para> <para> - Set <literal>dontWrapQtApps</literal> to stop applications from being wrapped - automatically. It is required to wrap applications manually with - <literal>wrapQtApp</literal>, using the syntax of - <xref linkend='fun-wrapProgram' />: + Set <literal>dontWrapQtApps</literal> to stop applications from being wrapped automatically. It is required to wrap applications manually with <literal>wrapQtApp</literal>, using the syntax of <xref linkend='fun-wrapProgram' />: <programlisting> mkDerivation { # ... @@ -113,17 +89,12 @@ mkDerivation { <note> <para> - <literal>wrapQtAppsHook</literal> ignores files that are non-ELF - executables. This means that scripts won't be automatically wrapped so - you'll need to manually wrap them as previously mentioned. An example of - when you'd always need to do this is with Python applications that use PyQT. + <literal>wrapQtAppsHook</literal> ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. </para> </note> <para> - Libraries are built with every available version of Qt. Use the - <literal>meta.broken</literal> attribute to disable the package for - unsupported Qt versions: + Libraries are built with every available version of Qt. Use the <literal>meta.broken</literal> attribute to disable the package for unsupported Qt versions: <programlisting> mkDerivation { # ... @@ -137,9 +108,7 @@ mkDerivation { <formalpara> <title>Adding a library to Nixpkgs</title> <para> - Add a Qt library to <filename>all-packages.nix</filename> by adding it to - the collection inside <literal>mkLibsForQt5</literal>. This ensures that the - library is built with every available version of Qt as needed. + Add a Qt library to <filename>all-packages.nix</filename> by adding it to the collection inside <literal>mkLibsForQt5</literal>. This ensures that the library is built with every available version of Qt as needed. <example xml:id='qt-library-all-packages-nix'> <title>Adding a Qt library to <filename>all-packages.nix</filename></title> <programlisting> @@ -162,10 +131,7 @@ mkDerivation { <formalpara> <title>Adding an application to Nixpkgs</title> <para> - Add a Qt application to <filename>all-packages.nix</filename> using - <literal>libsForQt5.callPackage</literal> instead of the usual - <literal>callPackage</literal>. The former ensures that all dependencies are - built with the same version of Qt. + Add a Qt application to <filename>all-packages.nix</filename> using <literal>libsForQt5.callPackage</literal> instead of the usual <literal>callPackage</literal>. The former ensures that all dependencies are built with the same version of Qt. <example xml:id='qt-application-all-packages-nix'> <title>Adding a Qt application to <filename>all-packages.nix</filename></title> <programlisting> diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index df4e5acb22c..b28745fd6e2 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -4,11 +4,7 @@ <title>Ruby</title> <para> - There currently is support to bundle applications that are packaged as Ruby - gems. The utility "bundix" allows you to write a - <filename>Gemfile</filename>, let bundler create a - <filename>Gemfile.lock</filename>, and then convert this into a nix - expression that contains all Gem dependencies automatically. + There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a <filename>Gemfile</filename>, let bundler create a <filename>Gemfile.lock</filename>, and then convert this into a nix expression that contains all Gem dependencies automatically. </para> <para> @@ -45,9 +41,7 @@ bundlerEnv rec { </screen> <para> - Please check in the <filename>Gemfile</filename>, - <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so - future updates can be run easily. + Please check in the <filename>Gemfile</filename>, <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so future updates can be run easily. </para> <para> @@ -62,10 +56,7 @@ $ nix-shell -p bundix --run 'bundix' </screen> <para> - For tools written in Ruby - i.e. where the desire is to install a package and - then execute e.g. <command>rake</command> at the command line, there is an - alternative builder called <literal>bundlerApp</literal>. Set up the - <filename>gemset.nix</filename> the same way, and then, for example: + For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example: </para> <screen> @@ -87,29 +78,11 @@ bundlerApp { </screen> <para> - The chief advantage of <literal>bundlerApp</literal> over - <literal>bundlerEnv</literal> is the executables introduced in the - environment are precisely those selected in the <literal>exes</literal> list, - as opposed to <literal>bundlerEnv</literal> which adds all the executables - made available by gems in the gemset, which can mean e.g. - <command>rspec</command> or <command>rake</command> in unpredictable versions - available from various packages. + The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages. </para> <para> - Resulting derivations for both builders also have two helpful attributes, - <literal>env</literal> and <literal>wrappedRuby</literal>. The first one - allows one to quickly drop into <command>nix-shell</command> with the - specified environment present. E.g. <command>nix-shell -A sensu.env</command> - would give you an environment with Ruby preset so it has all the libraries - necessary for <literal>sensu</literal> in its paths. The second one can be - used to make derivations from custom Ruby scripts which have - <filename>Gemfile</filename>s with their dependencies specified. It is a - derivation with <command>ruby</command> wrapped so it can find all the needed - dependencies. For example, to make a derivation <literal>my-script</literal> - for a <filename>my-script.rb</filename> (which should be placed in - <filename>bin</filename>) you should run <command>bundix</command> as - specified above and then use <literal>bundlerEnv</literal> like this: + Resulting derivations for both builders also have two helpful attributes, <literal>env</literal> and <literal>wrappedRuby</literal>. The first one allows one to quickly drop into <command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have <filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies. For example, to make a derivation <literal>my-script</literal> for a <filename>my-script.rb</filename> (which should be placed in <filename>bin</filename>) you should run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> like this: </para> <programlisting> diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index 97f274933be..7876cc213b6 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -4,8 +4,7 @@ <title>TeX Live</title> <para> - Since release 15.09 there is a new TeX Live packaging that lives entirely - under attribute <varname>texlive</varname>. + Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>. </para> <section xml:id="sec-language-texlive-users-guide"> @@ -14,28 +13,23 @@ <itemizedlist> <listitem> <para> - For basic usage just pull <varname>texlive.combined.scheme-basic</varname> - for an environment with basic LaTeX support. + For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support. </para> </listitem> <listitem> <para> - It typically won't work to use separately installed packages together. - Instead, you can build a custom set of packages like this: + It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: <programlisting> texlive.combine { inherit (texlive) scheme-small collection-langkorean algorithms cm-super; } </programlisting> - There are all the schemes, collections and a few thousand packages, as - defined upstream (perhaps with tiny differences). + There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). </para> </listitem> <listitem> <para> - By default you only get executables and files needed during runtime, and a - little documentation for the core packages. To change that, you need to - add <varname>pkgFilter</varname> function to <varname>combine</varname>. + By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>. <programlisting> texlive.combine { # inherit (texlive) whatever-you-want; @@ -59,10 +53,7 @@ nix-repl> texlive.collection-<TAB> </listitem> <listitem> <para> - Note that the wrapper assumes that the result has a chance to be useful. - For example, the core executables should be present, as well as some core - data files. The supported way of ensuring this is by including some - scheme, for example <varname>scheme-basic</varname>, into the combination. + Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example <varname>scheme-basic</varname>, into the combination. </para> </listitem> </itemizedlist> @@ -84,14 +75,12 @@ nix-repl> texlive.collection-<TAB> </listitem> <listitem> <para> - feature/bug: when a package is rejected by <varname>pkgFilter</varname>, - its dependencies are still propagated; + feature/bug: when a package is rejected by <varname>pkgFilter</varname>, its dependencies are still propagated; </para> </listitem> <listitem> <para> - in case of any bugs or feature requests, file a github issue or better a - pull request and /cc @vcunat. + in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat. </para> </listitem> </itemizedlist> diff --git a/doc/meta.xml b/doc/meta.xml index 49db73ab79e..9371196818a 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -3,10 +3,7 @@ xml:id="chap-meta"> <title>Meta-attributes</title> <para> - Nix packages can declare <emphasis>meta-attributes</emphasis> that contain - information about a package such as a description, its homepage, its license, - and so on. For instance, the GNU Hello package has a <varname>meta</varname> - declaration like this: + Nix packages can declare <emphasis>meta-attributes</emphasis> that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a <varname>meta</varname> declaration like this: <programlisting> meta = with stdenv.lib; { description = "A program that produces a familiar, friendly greeting"; @@ -22,13 +19,10 @@ meta = with stdenv.lib; { </programlisting> </para> <para> - Meta-attributes are not passed to the builder of the package. Thus, a change - to a meta-attribute doesn’t trigger a recompilation of the package. The - value of a meta-attribute must be a string. + Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string. </para> <para> - The meta-attributes of a package can be queried from the command-line using - <command>nix-env</command>: + The meta-attributes of a package can be queried from the command-line using <command>nix-env</command>: <screen> <prompt>$ </prompt>nix-env -qa hello --json { @@ -67,8 +61,7 @@ meta = with stdenv.lib; { </screen> - <command>nix-env</command> knows about the <varname>description</varname> - field specifically: + <command>nix-env</command> knows about the <varname>description</varname> field specifically: <screen> <prompt>$ </prompt>nix-env -qa hello --description hello-2.3 A program that produces a familiar, friendly greeting @@ -88,18 +81,13 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - A short (one-line) description of the package. This is shown by - <command>nix-env -q --description</command> and also on the Nixpkgs - release pages. + A short (one-line) description of the package. This is shown by <command>nix-env -q --description</command> and also on the Nixpkgs release pages. </para> <para> - Don’t include a period at the end. Don’t include newline characters. - Capitalise the first character. For brevity, don’t repeat the name of - package — just describe what it does. + Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package — just describe what it does. </para> <para> - Wrong: <literal>"libpng is a library that allows you to decode PNG - images."</literal> + Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal> </para> <para> Right: <literal>"A library for decoding PNG images"</literal> @@ -122,9 +110,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - Release branch. Used to specify that a package is not going to receive - updates that are not in this branch; for example, Linux kernel 3.0 is - supposed to be updated to 3.0.X, not 3.1. + Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. </para> </listitem> </varlistentry> @@ -134,8 +120,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - The package’s homepage. Example: - <literal>https://www.gnu.org/software/hello/manual/</literal> + The package’s homepage. Example: <literal>https://www.gnu.org/software/hello/manual/</literal> </para> </listitem> </varlistentry> @@ -145,8 +130,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - The page where a link to the current version can be found. Example: - <literal>https://ftp.gnu.org/gnu/hello/</literal> + The page where a link to the current version can be found. Example: <literal>https://ftp.gnu.org/gnu/hello/</literal> </para> </listitem> </varlistentry> @@ -156,10 +140,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - A link or a list of links to the location of Changelog for a package. A - link may use expansion to refer to the correct changelog version. - Example: - <literal>"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"</literal> + A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: <literal>"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"</literal> </para> </listitem> </varlistentry> @@ -169,46 +150,32 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - The license, or licenses, for the package. One from the attribute set - defined in - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> - <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment - using both a list of licenses and a single license is valid. If the - license field is in the form of a list representation, then it means that - parts of the package are licensed differently. Each license should - preferably be referenced by their attribute. The non-list attribute value - can also be a space delimited string representation of the contained - attribute shortNames or spdxIds. The following are all valid examples: + The license, or licenses, for the package. One from the attribute set defined in <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute shortNames or spdxIds. The following are all valid examples: <itemizedlist> <listitem> <para> - Single license referenced by attribute (preferred) - <literal>stdenv.lib.licenses.gpl3</literal>. + Single license referenced by attribute (preferred) <literal>stdenv.lib.licenses.gpl3</literal>. </para> </listitem> <listitem> <para> - Single license referenced by its attribute shortName (frowned upon) - <literal>"gpl3"</literal>. + Single license referenced by its attribute shortName (frowned upon) <literal>"gpl3"</literal>. </para> </listitem> <listitem> <para> - Single license referenced by its attribute spdxId (frowned upon) - <literal>"GPL-3.0"</literal>. + Single license referenced by its attribute spdxId (frowned upon) <literal>"GPL-3.0"</literal>. </para> </listitem> <listitem> <para> - Multiple licenses referenced by attribute (preferred) <literal>with - stdenv.lib.licenses; [ asl20 free ofl ]</literal>. + Multiple licenses referenced by attribute (preferred) <literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>. </para> </listitem> <listitem> <para> - Multiple licenses referenced as a space delimited string of attribute - shortNames (frowned upon) <literal>"asl20 free ofl"</literal>. + Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) <literal>"asl20 free ofl"</literal>. </para> </listitem> </itemizedlist> @@ -222,13 +189,8 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - A list of names and e-mail addresses of the maintainers of this Nix - expression. If you would like to be a maintainer of a package, you may - want to add yourself to - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link> - and write something like <literal>[ stdenv.lib.maintainers.alice - stdenv.lib.maintainers.bob ]</literal>. + A list of names and e-mail addresses of the maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link> and write something like <literal>[ stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob ]</literal>. </para> </listitem> </varlistentry> @@ -238,10 +200,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - The <emphasis>priority</emphasis> of the package, used by - <command>nix-env</command> to resolve file name conflicts between - packages. See the Nix manual page for <command>nix-env</command> for - details. Example: <literal>"10"</literal> (a low-priority package). + The <emphasis>priority</emphasis> of the package, used by <command>nix-env</command> to resolve file name conflicts between packages. See the Nix manual page for <command>nix-env</command> for details. Example: <literal>"10"</literal> (a low-priority package). </para> </listitem> </varlistentry> @@ -251,15 +210,11 @@ hello-2.3 A program that produces a familiar, friendly greeting </term> <listitem> <para> - The list of Nix platform types on which the package is supported. Hydra - builds packages according to the platform specified. If no platform is - specified, the package does not have prebuilt binaries. An example is: + The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is: <programlisting> meta.platforms = stdenv.lib.platforms.linux; </programlisting> - Attribute Set <varname>stdenv.lib.platforms</varname> defines - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix"> - various common lists</link> of platforms types. + Attribute Set <varname>stdenv.lib.platforms</varname> defines <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix"> various common lists</link> of platforms types. </para> </listitem> </varlistentry> @@ -270,23 +225,14 @@ meta.platforms = stdenv.lib.platforms.linux; <listitem> <warning> <para> - This attribute is special in that it is not actually under the - <literal>meta</literal> attribute set but rather under the - <literal>passthru</literal> attribute set. This is due to how - <literal>meta</literal> attributes work, and the fact that they are - supposed to contain only metadata, not derivations. + This attribute is special in that it is not actually under the <literal>meta</literal> attribute set but rather under the <literal>passthru</literal> attribute set. This is due to how <literal>meta</literal> attributes work, and the fact that they are supposed to contain only metadata, not derivations. </para> </warning> <para> - An attribute set with as values tests. A test is a derivation, which - builds successfully when the test passes, and fails to build otherwise. A - derivation that is a test needs to have <literal>meta.timeout</literal> - defined. + An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have <literal>meta.timeout</literal> defined. </para> <para> - The NixOS tests are available as <literal>nixosTests</literal> in - parameters of derivations. For instance, the OpenSMTPD derivation - includes lines similar to: + The NixOS tests are available as <literal>nixosTests</literal> in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: <programlisting> { /* ... */, nixosTests }: { @@ -305,13 +251,7 @@ meta.platforms = stdenv.lib.platforms.linux; </term> <listitem> <para> - A timeout (in seconds) for building the derivation. If the derivation - takes longer than this time to build, it can fail due to breaking the - timeout. However, all computers do not have the same computing power, - hence some builders may decide to apply a multiplicative factor to this - value. When filling this value in, try to keep it approximately - consistent with other values already present in - <literal>nixpkgs</literal>. + A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in <literal>nixpkgs</literal>. </para> </listitem> </varlistentry> @@ -321,13 +261,7 @@ meta.platforms = stdenv.lib.platforms.linux; </term> <listitem> <para> - The list of Nix platform types for which the Hydra instance at - <literal>hydra.nixos.org</literal> will build the package. (Hydra is the - Nix-based continuous build system.) It defaults to the value of - <varname>meta.platforms</varname>. Thus, the only reason to set - <varname>meta.hydraPlatforms</varname> is if you want - <literal>hydra.nixos.org</literal> to build the package on a subset of - <varname>meta.platforms</varname>, or not at all, e.g. + The list of Nix platform types for which the Hydra instance at <literal>hydra.nixos.org</literal> will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of <varname>meta.platforms</varname>. Thus, the only reason to set <varname>meta.hydraPlatforms</varname> is if you want <literal>hydra.nixos.org</literal> to build the package on a subset of <varname>meta.platforms</varname>, or not at all, e.g. <programlisting> meta.platforms = stdenv.lib.platforms.linux; meta.hydraPlatforms = []; @@ -341,10 +275,7 @@ meta.hydraPlatforms = []; </term> <listitem> <para> - If set to <literal>true</literal>, the package is marked as “broken”, - meaning that it won’t show up in <literal>nix-env -qa</literal>, and - cannot be built or installed. Such packages should be removed from - Nixpkgs eventually unless they are fixed. + If set to <literal>true</literal>, the package is marked as “broken”, meaning that it won’t show up in <literal>nix-env -qa</literal>, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. </para> </listitem> </varlistentry> @@ -354,12 +285,7 @@ meta.hydraPlatforms = []; </term> <listitem> <para> - If set to <literal>true</literal>, the package is tested to be updated - correctly by the <literal>update-walker.sh</literal> script without - additional settings. Such packages have <varname>meta.version</varname> - set and their homepage (or the page specified by - <varname>meta.downloadPage</varname>) contains a direct link to the - package tarball. + If set to <literal>true</literal>, the package is tested to be updated correctly by the <literal>update-walker.sh</literal> script without additional settings. Such packages have <varname>meta.version</varname> set and their homepage (or the page specified by <varname>meta.downloadPage</varname>) contains a direct link to the package tarball. </para> </listitem> </varlistentry> @@ -369,17 +295,11 @@ meta.hydraPlatforms = []; <title>Licenses</title> <para> - The <varname>meta.license</varname> attribute should preferrably contain a - value from <varname>stdenv.lib.licenses</varname> defined in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> - <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license - description of the same format if the license is unlikely to be useful in - another expression. + The <varname>meta.license</varname> attribute should preferrably contain a value from <varname>stdenv.lib.licenses</varname> defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license description of the same format if the license is unlikely to be useful in another expression. </para> <para> - Although it's typically better to indicate the specific license, a few - generic options are available: + Although it's typically better to indicate the specific license, a few generic options are available: <variablelist> <varlistentry> <term> @@ -397,18 +317,10 @@ meta.hydraPlatforms = []; </term> <listitem> <para> - Unfree package that can be redistributed in binary form. That is, it’s - legal to redistribute the <emphasis>output</emphasis> of the derivation. - This means that the package can be included in the Nixpkgs channel. + Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the <emphasis>output</emphasis> of the derivation. This means that the package can be included in the Nixpkgs channel. </para> <para> - Sometimes proprietary software can only be redistributed unmodified. - Make sure the builder doesn’t actually modify the original binaries; - otherwise we’re breaking the license. For instance, the NVIDIA X11 - drivers can be redistributed unmodified, but our builder applies - <command>patchelf</command> to make them work. Thus, its license is - <varname>"unfree"</varname> and it cannot be included in the Nixpkgs - channel. + Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies <command>patchelf</command> to make them work. Thus, its license is <varname>"unfree"</varname> and it cannot be included in the Nixpkgs channel. </para> </listitem> </varlistentry> @@ -418,9 +330,7 @@ meta.hydraPlatforms = []; </term> <listitem> <para> - Unfree package that cannot be redistributed. You can build it yourself, - but you cannot redistribute the output of the derivation. Thus it cannot - be included in the Nixpkgs channel. + Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel. </para> </listitem> </varlistentry> @@ -430,9 +340,7 @@ meta.hydraPlatforms = []; </term> <listitem> <para> - This package supplies unfree, redistributable firmware. This is a - separate value from <varname>unfree-redistributable</varname> because - not everybody cares whether firmware is free. + This package supplies unfree, redistributable firmware. This is a separate value from <varname>unfree-redistributable</varname> because not everybody cares whether firmware is free. </para> </listitem> </varlistentry> diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index d0247e081f9..83275bb2fbd 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -10,31 +10,16 @@ <title>Introduction</title> <para> - The Nix language allows a derivation to produce multiple outputs, which is - similar to what is utilized by other Linux distribution packaging systems. - The outputs reside in separate Nix store paths, so they can be mostly - handled independently of each other, including passing to build inputs, - garbage collection or binary substitution. The exception is that building - from source always produces all the outputs. + The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. </para> <para> - The main motivation is to save disk space by reducing runtime closure sizes; - consequently also sizes of substituted binaries get reduced. Splitting can - be used to have more granular runtime dependencies, for example the typical - reduction is to split away development-only files, as those are typically - not needed during runtime. As a result, closure sizes of many packages can - get reduced to a half or even much less. + The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. </para> <note> <para> - The reduction effects could be instead achieved by building the parts in - completely separate derivations. That would often additionally reduce - build-time closures, but it tends to be much harder to write such - derivations, as build systems typically assume all parts are being built at - once. This compromise approach of single source package producing multiple - binary packages is also utilized often by rpm and deb. + The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. </para> </note> </section> @@ -42,23 +27,18 @@ <title>Installing a split package</title> <para> - When installing a package via <varname>systemPackages</varname> or - <command>nix-env</command> you have several options: + When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options: </para> <itemizedlist> <listitem> <para> - You can install particular outputs explicitly, as each is available in the - Nix language as an attribute of the package. The - <varname>outputs</varname> attribute contains a list of output names. + You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names. </para> </listitem> <listitem> <para> - You can let it use the default outputs. These are handled by - <varname>meta.outputsToInstall</varname> attribute that contains a list of - output names. + You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names. </para> <para> TODO: more about tweaking the attribute, etc. @@ -66,19 +46,11 @@ </listitem> <listitem> <para> - NixOS provides configuration option - <varname>environment.extraOutputsToInstall</varname> that allows adding - extra outputs of <varname>environment.systemPackages</varname> atop the - default ones. It's mainly meant for documentation and debug symbols, and - it's also modified by specific options. + NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options. </para> <note> <para> - At this moment there is no similar configurability for packages installed - by <command>nix-env</command>. You can still use approach from - <xref linkend="sec-modify-via-packageOverrides" /> to override - <varname>meta.outputsToInstall</varname> attributes, but that's a rather - inconvenient way. + At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way. </para> </note> </listitem> @@ -88,25 +60,15 @@ <title>Using a split package</title> <para> - In the Nix language the individual outputs can be reached explicitly as - attributes, e.g. <varname>coreutils.info</varname>, but the typical case is - just using packages as build inputs. + In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs. </para> <para> - When a multiple-output derivation gets into a build input of another - derivation, the <varname>dev</varname> output is added if it exists, - otherwise the first output is added. In addition to that, - <varname>propagatedBuildOutputs</varname> of that package which by default - contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are - also added. (See <xref linkend="multiple-output-file-type-groups" />.) + When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.) </para> <para> - In some cases it may be desirable to combine different outputs under a - single store path. A function <literal>symlinkJoin</literal> can be used to - do this. (Note that it may negate some closure size benefits of using a - multiple-output package.) + In some cases it may be desirable to combine different outputs under a single store path. A function <literal>symlinkJoin</literal> can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.) </para> </section> <section xml:id="sec-multiple-outputs-"> @@ -117,29 +79,18 @@ </para> <para> - In nixpkgs there is a framework supporting multiple-output derivations. It - tries to cover most cases by default behavior. You can find the source - separated in - <<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>>; - it's relatively well-readable. The whole machinery is triggered by defining - the <varname>outputs</varname> attribute to contain the list of desired - output names (strings). + In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>>; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings). </para> <programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting> <para> - Often such a single line is enough. For each output an equally named - environment variable is passed to the builder and contains the path in nix - store for that output. Typically you also want to have the main - <varname>out</varname> output, as it catches any files that didn't get - elsewhere. + Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere. </para> <note> <para> - There is a special handling of the <varname>debug</varname> output, - described at <xref linkend="stdenv-separateDebugInfo" />. + There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />. </para> </note> @@ -147,36 +98,15 @@ <title><quote>Binaries first</quote></title> <para> - A commonly adopted convention in <literal>nixpkgs</literal> is that - executables provided by the package are contained within its first output. - This convention allows the dependent packages to reference the executables - provided by packages in a uniform manner. For instance, provided with the - knowledge that the <literal>perl</literal> package contains a - <literal>perl</literal> executable it can be referenced as - <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs - to execute a Perl script. + A commonly adopted convention in <literal>nixpkgs</literal> is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the <literal>perl</literal> package contains a <literal>perl</literal> executable it can be referenced as <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs to execute a Perl script. </para> <para> - The <literal>glibc</literal> package is a deliberate single exception to - the <quote>binaries first</quote> convention. The <literal>glibc</literal> - has <literal>libs</literal> as its first output allowing the libraries - provided by <literal>glibc</literal> to be referenced directly (e.g. - <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The - executables provided by <literal>glibc</literal> can be accessed via its - <literal>bin</literal> attribute (e.g. - <literal>${stdenv.glibc.bin}/bin/ldd</literal>). + The <literal>glibc</literal> package is a deliberate single exception to the <quote>binaries first</quote> convention. The <literal>glibc</literal> has <literal>libs</literal> as its first output allowing the libraries provided by <literal>glibc</literal> to be referenced directly (e.g. <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The executables provided by <literal>glibc</literal> can be accessed via its <literal>bin</literal> attribute (e.g. <literal>${stdenv.glibc.bin}/bin/ldd</literal>). </para> <para> - The reason for why <literal>glibc</literal> deviates from the convention is - because referencing a library provided by <literal>glibc</literal> is a - very common operation among Nix packages. For instance, third-party - executables packaged by Nix are typically patched and relinked with the - relevant version of <literal>glibc</literal> libraries from Nix packages - (please see the documentation on - <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more - details). + The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details). </para> </section> @@ -184,13 +114,7 @@ <title>File type groups</title> <para> - The support code currently recognizes some particular kinds of outputs and - either instructs the build system of the package to put files into their - desired outputs or it moves the files during the fixup phase. Each group of - file types has an <varname>outputFoo</varname> variable specifying the - output name where they should go. If that variable isn't defined by the - derivation writer, it is guessed – a default output name is defined, - falling back to other possibilities if the output isn't defined. + The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. </para> <variablelist> @@ -200,9 +124,7 @@ </term> <listitem> <para> - is for development-only files. These include C(++) headers, pkg-config, - cmake and aclocal files. They go to <varname>dev</varname> or - <varname>out</varname> by default. + is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default. </para> </listitem> </varlistentry> @@ -212,8 +134,7 @@ </term> <listitem> <para> - is meant for user-facing binaries, typically residing in bin/. They go - to <varname>bin</varname> or <varname>out</varname> by default. + is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default. </para> </listitem> </varlistentry> @@ -223,9 +144,7 @@ </term> <listitem> <para> - is meant for libraries, typically residing in <filename>lib/</filename> - and <filename>libexec/</filename>. They go to <varname>lib</varname> or - <varname>out</varname> by default. + is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default. </para> </listitem> </varlistentry> @@ -235,9 +154,7 @@ </term> <listitem> <para> - is for user documentation, typically residing in - <filename>share/doc/</filename>. It goes to <varname>doc</varname> or - <varname>out</varname> by default. + is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default. </para> </listitem> </varlistentry> @@ -247,10 +164,7 @@ </term> <listitem> <para> - is for <emphasis>developer</emphasis> documentation. Currently we count - gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> - or is removed (!) by default. This is because e.g. gtk-doc tends to be - rather large and completely unused by nixpkgs users. + is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. </para> </listitem> </varlistentry> @@ -260,8 +174,7 @@ </term> <listitem> <para> - is for man pages (except for section 3). They go to - <varname>man</varname> or <varname>$outputBin</varname> by default. + is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default. </para> </listitem> </varlistentry> @@ -271,8 +184,7 @@ </term> <listitem> <para> - is for section 3 man pages. They go to <varname>devman</varname> or - <varname>$outputMan</varname> by default. + is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default. </para> </listitem> </varlistentry> @@ -282,8 +194,7 @@ </term> <listitem> <para> - is for info pages. They go to <varname>info</varname> or - <varname>$outputBin</varname> by default. + is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default. </para> </listitem> </varlistentry> @@ -296,31 +207,22 @@ <itemizedlist> <listitem> <para> - Some configure scripts don't like some of the parameters passed by - default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You - can disable this by setting <literal>setOutputFlags = false;</literal>. + Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>. </para> </listitem> <listitem> <para> - The outputs of a single derivation can retain references to each other, - but note that circular references are not allowed. (And each - strongly-connected component would act as a single output anyway.) + The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.) </para> </listitem> <listitem> <para> - Most of split packages contain their core functionality in libraries. - These libraries tend to refer to various kind of data that typically gets - into <varname>out</varname>, e.g. locale strings, so there is often no - advantage in separating the libraries into <varname>lib</varname>, as - keeping them in <varname>out</varname> is easier. + Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier. </para> </listitem> <listitem> <para> - Some packages have hidden assumptions on install paths, which complicates - splitting. + Some packages have hidden assumptions on install paths, which complicates splitting. </para> </listitem> </itemizedlist> diff --git a/doc/overlays.xml b/doc/overlays.xml index bff2339ca93..26a888368ab 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -3,47 +3,32 @@ xml:id="chap-overlays"> <title>Overlays</title> <para> - This chapter describes how to extend and change Nixpkgs using overlays. - Overlays are used to add layers in the fixed-point used by Nixpkgs to compose - the set of all packages. + This chapter describes how to extend and change Nixpkgs using overlays. Overlays are used to add layers in the fixed-point used by Nixpkgs to compose the set of all packages. </para> <para> - Nixpkgs can be configured with a list of overlays, which are applied in - order. This means that the order of the overlays can be significant if - multiple layers override the same package. + Nixpkgs can be configured with a list of overlays, which are applied in order. This means that the order of the overlays can be significant if multiple layers override the same package. </para> <!--============================================================--> <section xml:id="sec-overlays-install"> <title>Installing overlays</title> <para> - The list of overlays can be set either explicitly in a Nix expression, or - through <literal><nixpkgs-overlays></literal> or user configuration - files. + The list of overlays can be set either explicitly in a Nix expression, or through <literal><nixpkgs-overlays></literal> or user configuration files. </para> <section xml:id="sec-overlays-argument"> <title>Set overlays in NixOS or Nix expressions</title> <para> - On a NixOS system the value of the <literal>nixpkgs.overlays</literal> - option, if present, is passed to the system Nixpkgs directly as an - argument. Note that this does not affect the overlays for non-NixOS - operations (e.g. <literal>nix-env</literal>), which are - <link xlink:href="#sec-overlays-lookup">looked</link> up independently. + On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for non-NixOS operations (e.g. <literal>nix-env</literal>), which are <link xlink:href="#sec-overlays-lookup">looked</link> up independently. </para> <para> - The list of overlays can be passed explicitly when importing nixpkgs, for - example <literal>import <nixpkgs> { overlays = [ overlay1 overlay2 ]; - }</literal>. + The list of overlays can be passed explicitly when importing nixpkgs, for example <literal>import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>. </para> <para> - Further overlays can be added by calling the <literal>pkgs.extend</literal> - or <literal>pkgs.appendOverlays</literal>, although it is often preferable - to avoid these functions, because they recompute the Nixpkgs fixpoint, - which is somewhat expensive to do. + Further overlays can be added by calling the <literal>pkgs.extend</literal> or <literal>pkgs.appendOverlays</literal>, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do. </para> </section> @@ -58,30 +43,20 @@ <orderedlist> <listitem> <para> - First, if an - <link xlink:href="#sec-overlays-argument"><varname>overlays</varname> - argument</link> to the Nixpkgs function itself is given, then that is - used and no path lookup will be performed. + First, if an <link xlink:href="#sec-overlays-argument"><varname>overlays</varname> argument</link> to the Nixpkgs function itself is given, then that is used and no path lookup will be performed. </para> </listitem> <listitem> <para> - Otherwise, if the Nix path entry - <literal><nixpkgs-overlays></literal> exists, we look for overlays at - that path, as described below. + Otherwise, if the Nix path entry <literal><nixpkgs-overlays></literal> exists, we look for overlays at that path, as described below. </para> <para> - See the section on <literal>NIX_PATH</literal> in the Nix manual for - more details on how to set a value for - <literal><nixpkgs-overlays>.</literal> + See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to set a value for <literal><nixpkgs-overlays>.</literal> </para> </listitem> <listitem> <para> - If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and - <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look - for overlays at that path, as described below. It is an error if both - exist. + If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as described below. It is an error if both exist. </para> </listitem> </orderedlist> @@ -92,15 +67,12 @@ <itemizedlist> <listitem> <para> - If the path is a file, then the file is imported as a Nix expression and - used as the list of overlays. + If the path is a file, then the file is imported as a Nix expression and used as the list of overlays. </para> </listitem> <listitem> <para> - If the path is a directory, then we take the content of the directory, - order it lexicographically, and attempt to interpret each as an overlay - by: + If the path is a directory, then we take the content of the directory, order it lexicographically, and attempt to interpret each as an overlay by: <itemizedlist> <listitem> <para> @@ -109,8 +81,7 @@ </listitem> <listitem> <para> - Importing a top-level <filename>default.nix</filename> file, if it is - a directory. + Importing a top-level <filename>default.nix</filename> file, if it is a directory. </para> </listitem> </itemizedlist> @@ -120,12 +91,7 @@ </para> <para> - Because overlays that are set in NixOS configuration do not affect - non-NixOS operations such as <literal>nix-env</literal>, the - <filename>overlays.nix</filename> option provides a convenient way to use - the same overlays for a NixOS system configuration and user configuration: - the same file can be used as <filename>overlays.nix</filename> and imported - as the value of <literal>nixpkgs.overlays</literal>. + Because overlays that are set in NixOS configuration do not affect non-NixOS operations such as <literal>nix-env</literal>, the <filename>overlays.nix</filename> option provides a convenient way to use the same overlays for a NixOS system configuration and user configuration: the same file can be used as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>. </para> <!-- TODO: Example of sharing overlays between NixOS configuration @@ -139,9 +105,7 @@ <title>Defining overlays</title> <para> - Overlays are Nix functions which accept two arguments, conventionally called - <varname>self</varname> and <varname>super</varname>, and return a set of - packages. For example, the following is a valid overlay. + Overlays are Nix functions which accept two arguments, conventionally called <varname>self</varname> and <varname>super</varname>, and return a set of packages. For example, the following is a valid overlay. </para> <programlisting> @@ -158,38 +122,19 @@ self: super: </programlisting> <para> - The first argument (<varname>self</varname>) corresponds to the final - package set. You should use this set for the dependencies of all packages - specified in your overlay. For example, all the dependencies of - <varname>rr</varname> in the example above come from - <varname>self</varname>, as well as the overridden dependencies used in the - <varname>boost</varname> override. + The first argument (<varname>self</varname>) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of <varname>rr</varname> in the example above come from <varname>self</varname>, as well as the overridden dependencies used in the <varname>boost</varname> override. </para> <para> - The second argument (<varname>super</varname>) corresponds to the result of - the evaluation of the previous stages of Nixpkgs. It does not contain any of - the packages added by the current overlay, nor any of the following - overlays. This set should be used either to refer to packages you wish to - override, or to access functions defined in Nixpkgs. For example, the - original recipe of <varname>boost</varname> in the above example, comes from - <varname>super</varname>, as well as the <varname>callPackage</varname> - function. + The second argument (<varname>super</varname>) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of <varname>boost</varname> in the above example, comes from <varname>super</varname>, as well as the <varname>callPackage</varname> function. </para> <para> - The value returned by this function should be a set similar to - <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden - and/or new packages. + The value returned by this function should be a set similar to <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden and/or new packages. </para> <para> - Overlays are similar to other methods for customizing Nixpkgs, in particular - the <literal>packageOverrides</literal> attribute described in - <xref linkend="sec-modify-via-packageOverrides"/>. Indeed, - <literal>packageOverrides</literal> acts as an overlay with only the - <varname>super</varname> argument. It is therefore appropriate for basic - use, but overlays are more powerful and easier to distribute. + Overlays are similar to other methods for customizing Nixpkgs, in particular the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>. Indeed, <literal>packageOverrides</literal> acts as an overlay with only the <varname>super</varname> argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. </para> </section> </chapter> diff --git a/doc/package-notes.xml b/doc/package-notes.xml index ef3c2a7c848..770b277cd90 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -3,38 +3,23 @@ xml:id="chap-package-notes"> <title>Package Notes</title> <para> - This chapter contains information about how to use and maintain the Nix - expressions for a number of specific packages, such as the Linux kernel or - X.org. + This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. </para> <!--============================================================--> <section xml:id="sec-linux-kernel"> <title>Linux kernel</title> <para> - The Nix expressions to build the Linux kernel are in - <link + The Nix expressions to build the Linux kernel are in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>. </para> <para> - The function that builds the kernel has an argument - <varname>kernelPatches</varname> which should be a list of <literal>{name, - patch, extraConfig}</literal> attribute sets, where <varname>name</varname> - is the name of the patch (which is included in the kernel’s - <varname>meta.description</varname> attribute), <varname>patch</varname> is - the patch itself (possibly compressed), and <varname>extraConfig</varname> - (optional) is a string specifying extra options to be concatenated to the - kernel configuration file (<filename>.config</filename>). + The function that builds the kernel has an argument <varname>kernelPatches</varname> which should be a list of <literal>{name, patch, extraConfig}</literal> attribute sets, where <varname>name</varname> is the name of the patch (which is included in the kernel’s <varname>meta.description</varname> attribute), <varname>patch</varname> is the patch itself (possibly compressed), and <varname>extraConfig</varname> (optional) is a string specifying extra options to be concatenated to the kernel configuration file (<filename>.config</filename>). </para> <para> - The kernel derivation exports an attribute <varname>features</varname> - specifying whether optional functionality is or isn’t enabled. This is - used in NixOS to implement kernel-specific behaviour. For instance, if the - kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support - for Intel wireless chipsets), then NixOS doesn’t have to build the - external <varname>iwlwifi</varname> package: + The kernel derivation exports an attribute <varname>features</varname> specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external <varname>iwlwifi</varname> package: <programlisting> modulesTree = [kernel] ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi @@ -47,45 +32,31 @@ modulesTree = [kernel] <orderedlist> <listitem> <para> - Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>) - to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update - it. + Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>) to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update it. </para> </listitem> <listitem> <para> - Add the new kernel to <filename>all-packages.nix</filename> (e.g., create - an attribute <varname>kernel_2_6_22</varname>). + Add the new kernel to <filename>all-packages.nix</filename> (e.g., create an attribute <varname>kernel_2_6_22</varname>). </para> </listitem> <listitem> <para> - Now we’re going to update the kernel configuration. First unpack the - kernel. Then for each supported platform (<literal>i686</literal>, - <literal>x86_64</literal>, <literal>uml</literal>) do the following: + Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (<literal>i686</literal>, <literal>x86_64</literal>, <literal>uml</literal>) do the following: <orderedlist> <listitem> <para> - Make an copy from the old config (e.g. - <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g. - <filename>config-2.6.22-i686-smp</filename>). + Make an copy from the old config (e.g. <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g. <filename>config-2.6.22-i686-smp</filename>). </para> </listitem> <listitem> <para> - Copy the config file for this platform (e.g. - <filename>config-2.6.22-i686-smp</filename>) to - <filename>.config</filename> in the kernel source tree. + Copy the config file for this platform (e.g. <filename>config-2.6.22-i686-smp</filename>) to <filename>.config</filename> in the kernel source tree. </para> </listitem> <listitem> <para> - Run <literal>make oldconfig - ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer - all questions. (For the uml configuration, also add - <literal>SHELL=bash</literal>.) Make sure to keep the configuration - consistent between platforms (i.e. don’t enable some feature on - <literal>i686</literal> and disable it on <literal>x86_64</literal>). + Run <literal>make oldconfig ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer all questions. (For the uml configuration, also add <literal>SHELL=bash</literal>.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on <literal>i686</literal> and disable it on <literal>x86_64</literal>). </para> </listitem> <listitem> @@ -99,8 +70,7 @@ modulesTree = [kernel] </listitem> <listitem> <para> - Copy <filename>.config</filename> over the new config file (e.g. - <filename>config-2.6.22-i686-smp</filename>). + Copy <filename>.config</filename> over the new config file (e.g. <filename>config-2.6.22-i686-smp</filename>). </para> </listitem> </orderedlist> @@ -108,18 +78,12 @@ modulesTree = [kernel] </listitem> <listitem> <para> - Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>. - If it compiles, ship it! For extra credit, try booting NixOS with it. + Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>. If it compiles, ship it! For extra credit, try booting NixOS with it. </para> </listitem> <listitem> <para> - It may be that the new kernel requires updating the external kernel - modules and kernel-dependent packages listed in the - <varname>linuxPackagesFor</varname> function in - <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS, - etc.). If the updated packages aren’t backwards compatible with older - kernels, you may need to keep the older versions around. + It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the <varname>linuxPackagesFor</varname> function in <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. </para> </listitem> </orderedlist> @@ -130,13 +94,7 @@ modulesTree = [kernel] <title>X.org</title> <para> - The Nix expressions for the X.org packages reside in - <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is - automatically generated from lists of tarballs in an X.org release. As such - it should not be modified directly; rather, you should modify the lists, the - generator script or the file - <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can - override or add to the derivations produced by the generator. + The Nix expressions for the X.org packages reside in <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can override or add to the derivations produced by the generator. </para> <para> @@ -146,37 +104,22 @@ modulesTree = [kernel] <prompt>$ </prompt>cat tarballs-7.5.list extra.list old.list \ | perl ./generate-expr-from-tarballs.pl </screen> - For each of the tarballs in the <filename>.list</filename> files, the script - downloads it, unpacks it, and searches its <filename>configure.ac</filename> - and <filename>*.pc.in</filename> files for dependencies. This information is - used to generate <filename>default.nix</filename>. The generator caches - downloaded tarballs between runs. Pay close attention to the <literal>NOT - FOUND: <replaceable>name</replaceable></literal> messages at the end of the - run, since they may indicate missing dependencies. (Some might be optional - dependencies, however.) + For each of the tarballs in the <filename>.list</filename> files, the script downloads it, unpacks it, and searches its <filename>configure.ac</filename> and <filename>*.pc.in</filename> files for dependencies. This information is used to generate <filename>default.nix</filename>. The generator caches downloaded tarballs between runs. Pay close attention to the <literal>NOT FOUND: <replaceable>name</replaceable></literal> messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) </para> <para> - A file like <filename>tarballs-7.5.list</filename> contains all tarballs in - a X.org release. It can be generated like this: + A file like <filename>tarballs-7.5.list</filename> contains all tarballs in a X.org release. It can be generated like this: <screen> <prompt>$ </prompt>export i="mirror://xorg/X11R7.4/src/everything/" <prompt>$ </prompt>cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ | sort > tarballs-7.4.list </screen> - <filename>extra.list</filename> contains libraries that aren’t part of - X.org proper, but are closely related to it, such as - <literal>libxcb</literal>. <filename>old.list</filename> contains some - packages that were removed from X.org, but are still needed by some people - or by other packages (such as <varname>imake</varname>). + <filename>extra.list</filename> contains libraries that aren’t part of X.org proper, but are closely related to it, such as <literal>libxcb</literal>. <filename>old.list</filename> contains some packages that were removed from X.org, but are still needed by some people or by other packages (such as <varname>imake</varname>). </para> <para> - If the expression for a package requires derivation attributes that the - generator cannot figure out automatically (say, <varname>patches</varname> - or a <varname>postInstall</varname> hook), you should modify - <filename>pkgs/servers/x11/xorg/overrides.nix</filename>. + If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, <varname>patches</varname> or a <varname>postInstall</varname> hook), you should modify <filename>pkgs/servers/x11/xorg/overrides.nix</filename>. </para> </section> <!--============================================================--> @@ -199,41 +142,19 @@ modulesTree = [kernel] <title>Eclipse</title> <para> - The Nix expressions related to the Eclipse platform and IDE are in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>. + The Nix expressions related to the Eclipse platform and IDE are in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>. </para> <para> - Nixpkgs provides a number of packages that will install Eclipse in its - various forms. These range from the bare-bones Eclipse Platform to the more - fully featured Eclipse SDK or Scala-IDE packages and multiple version are - often available. It is possible to list available Eclipse packages by - issuing the command: + Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: <screen> <prompt>$ </prompt>nix-env -f '<nixpkgs>' -qaP -A eclipses --description </screen> - Once an Eclipse variant is installed it can be run using the - <command>eclipse</command> command, as expected. From within Eclipse it is - then possible to install plugins in the usual manner by either manually - specifying an Eclipse update site or by installing the Marketplace Client - plugin and using it to discover and install other plugins. This installation - method provides an Eclipse installation that closely resemble a manually - installed Eclipse. + Once an Eclipse variant is installed it can be run using the <command>eclipse</command> command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. </para> <para> - If you prefer to install plugins in a more declarative manner then Nixpkgs - also offer a number of Eclipse plugins that can be installed in an - <emphasis>Eclipse environment</emphasis>. This type of environment is - created using the function <varname>eclipseWithPlugins</varname> found - inside the <varname>nixpkgs.eclipses</varname> attribute set. This function - takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal> - where <varname>eclipse</varname> is a one of the Eclipse packages described - above, <varname>plugins</varname> is a list of plugin derivations, and - <varname>jvmArgs</varname> is a list of arguments given to the JVM running - the Eclipse. For example, say you wish to install the latest Eclipse - Platform with the popular Eclipse Color Theme plugin and also allow Eclipse - to use more RAM. You could then add + If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an <emphasis>Eclipse environment</emphasis>. This type of environment is created using the function <varname>eclipseWithPlugins</varname> found inside the <varname>nixpkgs.eclipses</varname> attribute set. This function takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal> where <varname>eclipse</varname> is a one of the Eclipse packages described above, <varname>plugins</varname> is a list of plugin derivations, and <varname>jvmArgs</varname> is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add <screen> packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -243,38 +164,18 @@ packageOverrides = pkgs: { }; } </screen> - to your Nixpkgs configuration - (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by - running <command>nix-env -f '<nixpkgs>' -iA myEclipse</command> and - afterward run Eclipse as usual. It is possible to find out which plugins are - available for installation using <varname>eclipseWithPlugins</varname> by - running + to your Nixpkgs configuration (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by running <command>nix-env -f '<nixpkgs>' -iA myEclipse</command> and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using <varname>eclipseWithPlugins</varname> by running <screen> <prompt>$ </prompt>nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description </screen> </para> <para> - If there is a need to install plugins that are not available in Nixpkgs then - it may be possible to define these plugins outside Nixpkgs using the - <varname>buildEclipseUpdateSite</varname> and - <varname>buildEclipsePlugin</varname> functions found in the - <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the - <varname>buildEclipseUpdateSite</varname> function to install a plugin - distributed as an Eclipse update site. This function takes <literal>{ name, - src }</literal> as argument where <literal>src</literal> indicates the - Eclipse update site archive. All Eclipse features and plugins within the - downloaded update site will be installed. When an update site archive is not - available then the <varname>buildEclipsePlugin</varname> function can be - used to install a plugin that consists of a pair of feature and plugin JARs. - This function takes an argument <literal>{ name, srcFeature, srcPlugin - }</literal> where <literal>srcFeature</literal> and - <literal>srcPlugin</literal> are the feature and plugin JARs, respectively. + If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and <varname>buildEclipsePlugin</varname> functions found in the <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the <varname>buildEclipseUpdateSite</varname> function to install a plugin distributed as an Eclipse update site. This function takes <literal>{ name, src }</literal> as argument where <literal>src</literal> indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the <varname>buildEclipsePlugin</varname> function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument <literal>{ name, srcFeature, srcPlugin }</literal> where <literal>srcFeature</literal> and <literal>srcPlugin</literal> are the feature and plugin JARs, respectively. </para> <para> - Expanding the previous example with two plugins using the above functions we - have + Expanding the previous example with two plugins using the above functions we have <screen> packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -311,19 +212,15 @@ packageOverrides = pkgs: { <title>Elm</title> <para> - To start a development environment do <command>nix-shell -p elmPackages.elm - elmPackages.elm-format</command> + To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command> </para> <para> - To update Elm compiler, see - <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>. + To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>. </para> <para> - To package Elm applications, - <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about - elm2nix</link>. + To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>. </para> </section> <section xml:id="sec-kakoune"> @@ -342,11 +239,7 @@ packageOverrides = pkgs: { <title>Interactive shell helpers</title> <para> - Some packages provide the shell integration to be more useful. But unlike - other systems, nix doesn't have a standard share directory location. This is - why a bunch <command>PACKAGE-share</command> scripts are shipped that print - the location of the corresponding shared folder. Current list of such - packages is as following: + Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch <command>PACKAGE-share</command> scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following: <itemizedlist> <listitem> <para> @@ -369,31 +262,20 @@ packageOverrides = pkgs: { <title>Weechat</title> <para> - Weechat can be configured to include your choice of plugins, reducing its - closure size from the default configuration which includes all available - plugins. To make use of this functionality, install an expression that - overrides its configuration such as + Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as <programlisting>weechat.override {configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ python perl ]; } }</programlisting> - If the <literal>configure</literal> function returns an attrset without the - <literal>plugins</literal> attribute, <literal>availablePlugins</literal> - will be used automatically. + If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal> attribute, <literal>availablePlugins</literal> will be used automatically. </para> <para> - The plugins currently available are <literal>python</literal>, - <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>, - <literal>tcl</literal> and <literal>lua</literal>. + The plugins currently available are <literal>python</literal>, <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>, <literal>tcl</literal> and <literal>lua</literal>. </para> <para> - The python and perl plugins allows the addition of extra libraries. For - instance, the <literal>inotify.py</literal> script in weechat-scripts - requires D-Bus or libnotify, and the <literal>fish.py</literal> script - requires pycrypto. To use these scripts, use the plugin's - <literal>withPackages</literal> attribute: + The python and perl plugins allows the addition of extra libraries. For instance, the <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or libnotify, and the <literal>fish.py</literal> script requires pycrypto. To use these scripts, use the plugin's <literal>withPackages</literal> attribute: <programlisting>weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) @@ -404,8 +286,7 @@ packageOverrides = pkgs: { </para> <para> - In order to also keep all default plugins installed, it is possible to use - the following method: + In order to also keep all default plugins installed, it is possible to use the following method: <programlisting>weechat.override { configure = { availablePlugins, ... }: { plugins = builtins.attrValues (availablePlugins // { python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); @@ -415,9 +296,7 @@ packageOverrides = pkgs: { </para> <para> - WeeChat allows to set defaults on startup using the - <literal>--run-command</literal>. The <literal>configure</literal> method - can be used to pass commands to the program: + WeeChat allows to set defaults on startup using the <literal>--run-command</literal>. The <literal>configure</literal> method can be used to pass commands to the program: <programlisting>weechat.override { configure = { availablePlugins, ... }: { init = '' @@ -426,14 +305,11 @@ packageOverrides = pkgs: { ''; }; }</programlisting> - Further values can be added to the list of commands when running - <literal>weechat --run-command "your-commands"</literal>. + Further values can be added to the list of commands when running <literal>weechat --run-command "your-commands"</literal>. </para> <para> - Additionally it's possible to specify scripts to be loaded when starting - <literal>weechat</literal>. These will be loaded before the commands from - <literal>init</literal>: + Additionally it's possible to specify scripts to be loaded when starting <literal>weechat</literal>. These will be loaded before the commands from <literal>init</literal>: <programlisting>weechat.override { configure = { availablePlugins, ... }: { scripts = with pkgs.weechatScripts; [ @@ -447,11 +323,7 @@ packageOverrides = pkgs: { </para> <para> - In <literal>nixpkgs</literal> there's a subpackage which contains - derivations for WeeChat scripts. Such derivations expect a - <literal>passthru.scripts</literal> attribute which contains a list of all - scripts inside the store path. Furthermore all scripts have to live in - <literal>$out/share</literal>. An exemplary derivation looks like this: + In <literal>nixpkgs</literal> there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a <literal>passthru.scripts</literal> attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in <literal>$out/share</literal>. An exemplary derivation looks like this: <programlisting>{ stdenv, fetchurl }: stdenv.mkDerivation { @@ -480,18 +352,11 @@ stdenv.mkDerivation { <title>Activating the engine</title> <para> - IBus needs to be configured accordingly to activate - <literal>typing-booster</literal>. The configuration depends on the desktop - manager in use. For detailed instructions, please refer to the - <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream - docs</link>. + IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>. </para> <para> - On NixOS you need to explicitly enable <literal>ibus</literal> with given - engines before customizing your desktop to use - <literal>typing-booster</literal>. This can be achieved using the - <literal>ibus</literal> module: + On NixOS you need to explicitly enable <literal>ibus</literal> with given engines before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved using the <literal>ibus</literal> module: <programlisting>{ pkgs, ... }: { i18n.inputMethod = { enabled = "ibus"; @@ -505,21 +370,14 @@ stdenv.mkDerivation { <title>Using custom hunspell dictionaries</title> <para> - The IBus engine is based on <literal>hunspell</literal> to support - completion in many languages. By default the dictionaries - <literal>de-de</literal>, <literal>en-us</literal>, - <literal>fr-moderne</literal> <literal>es-es</literal>, - <literal>it-it</literal>, <literal>sv-se</literal> and - <literal>sv-fi</literal> are in use. To add another dictionary, the package - can be overridden like this: + The IBus engine is based on <literal>hunspell</literal> to support completion in many languages. By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>fr-moderne</literal> <literal>es-es</literal>, <literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add another dictionary, the package can be overridden like this: <programlisting>ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }</programlisting> </para> <para> - <emphasis>Note: each language passed to <literal>langs</literal> must be an - attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis> + <emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis> </para> </section> @@ -527,10 +385,7 @@ stdenv.mkDerivation { <title>Built-in emoji picker</title> <para> - The <literal>ibus-engines.typing-booster</literal> package contains a - program named <literal>emoji-picker</literal>. To display all emojis - correctly, a special font such as <literal>noto-fonts-emoji</literal> is - needed: + The <literal>ibus-engines.typing-booster</literal> package contains a program named <literal>emoji-picker</literal>. To display all emojis correctly, a special font such as <literal>noto-fonts-emoji</literal> is needed: </para> <para> @@ -545,45 +400,22 @@ stdenv.mkDerivation { <title>Nginx</title> <para> - <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and - lightweight webserver. + <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and lightweight webserver. </para> <section xml:id="sec-nginx-etag"> <title>ETags on static files served from the Nix store</title> <para> - HTTP has a couple different mechanisms for caching to prevent clients from - having to download the same content repeatedly if a resource has not - changed since the last time it was requested. When nginx is used as a - server for static files, it implements the caching mechanism based on the - <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link> - response header automatically; unfortunately, it works by using filesystem - timestamps to determine the value of the <literal>Last-Modified</literal> - header. This doesn't give the desired behavior when the file is in the Nix - store, because all file timestamps are set to 0 (for reasons related to - build reproducibility). + HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link> response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the <literal>Last-Modified</literal> header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility). </para> <para> - Fortunately, HTTP supports an alternative (and more effective) caching - mechanism: the - <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link> - response header. The value of the <literal>ETag</literal> header specifies - some identifier for the particular content that the server is sending (e.g. - a hash). When a client makes a second request for the same resource, it - sends that value back in an <literal>If-None-Match</literal> header. If the - ETag value is unchanged, then the server does not need to resend the - content. + Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link> response header. The value of the <literal>ETag</literal> header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an <literal>If-None-Match</literal> header. If the ETag value is unchanged, then the server does not need to resend the content. </para> <para> - As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when - nginx serves a file out of <filename>/nix/store</filename>, the hash in the - store path is used as the <literal>ETag</literal> header in the HTTP - response, thus providing proper caching functionality. This happens - automatically; you do not need to do modify any configuration to get this - behavior. + As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of <filename>/nix/store</filename>, the hash in the store path is used as the <literal>ETag</literal> header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior. </para> </section> </section> diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml index 09af69bb15d..a3ee42dc7fa 100644 --- a/doc/package-specific-user-notes.xml +++ b/doc/package-specific-user-notes.xml @@ -1,46 +1,24 @@ <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="package-specific-user-notes"> <title>Package-specific usage notes</title> <para> - These chapters includes some notes that apply to specific packages and should - answer some of the frequently asked questions related to Nixpkgs use. Some - useful information related to package use can be found in - <link linkend="chap-package-notes">package-specific development notes</link>. + These chapters includes some notes that apply to specific packages and should answer some of the frequently asked questions related to Nixpkgs use. Some useful information related to package use can be found in <link linkend="chap-package-notes">package-specific development notes</link>. </para> <section xml:id="opengl"> <title>OpenGL</title> <para> - Packages that use OpenGL have NixOS desktop as their primary target. The - current solution for loading the GPU-specific drivers is based on - <literal>libglvnd</literal> and looks for the driver implementation in - <literal>LD_LIBRARY_PATH</literal>. If you are using a non-NixOS - GNU/Linux/X11 desktop with free software video drivers, consider launching - OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of - <literal>libglvnd</literal> and <literal>mesa_drivers</literal> in - <literal>LD_LIBRARY_PATH</literal>. For proprietary video drivers you might - have luck with also adding the corresponding video driver package. + Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on <literal>libglvnd</literal> and looks for the driver implementation in <literal>LD_LIBRARY_PATH</literal>. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of <literal>libglvnd</literal> and <literal>mesa_drivers</literal> in <literal>LD_LIBRARY_PATH</literal>. For proprietary video drivers you might have luck with also adding the corresponding video driver package. </para> </section> <section xml:id="locales"> <title>Locales</title> <para> - To allow simultaneous use of packages linked against different versions of - <literal>glibc</literal> with different locale archive formats Nixpkgs - patches <literal>glibc</literal> to rely on - <literal>LOCALE_ARCHIVE</literal> environment variable. + To allow simultaneous use of packages linked against different versions of <literal>glibc</literal> with different locale archive formats Nixpkgs patches <literal>glibc</literal> to rely on <literal>LOCALE_ARCHIVE</literal> environment variable. </para> <para> - On non-NixOS distributions this variable is obviously not set. This can - cause regressions in language support or even crashes in some - Nixpkgs-provided programs. The simplest way to mitigate this problem is - exporting the <literal>LOCALE_ARCHIVE</literal> variable pointing to - <literal>${glibcLocales}/lib/locale/locale-archive</literal>. The drawback - (and the reason this is not the default) is the relatively large (a hundred - MiB) size of the full set of locales. It is possible to build a custom set - of locales by overriding parameters <literal>allLocales</literal> and - <literal>locales</literal> of the package. + On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the <literal>LOCALE_ARCHIVE</literal> variable pointing to <literal>${glibcLocales}/lib/locale/locale-archive</literal>. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters <literal>allLocales</literal> and <literal>locales</literal> of the package. </para> </section> <section xml:id="sec-emacs"> @@ -50,15 +28,7 @@ <title>Configuring Emacs</title> <para> - The Emacs package comes with some extra helpers to make it easier to - configure. <varname>emacsWithPackages</varname> allows you to manage - packages from ELPA. This means that you will not have to install that - packages from within Emacs. For instance, if you wanted to use - <literal>company</literal>, <literal>counsel</literal>, - <literal>flycheck</literal>, <literal>ivy</literal>, - <literal>magit</literal>, <literal>projectile</literal>, and - <literal>use-package</literal> you could use this as a - <filename>~/.config/nixpkgs/config.nix</filename> override: + The Emacs package comes with some extra helpers to make it easier to configure. <varname>emacsWithPackages</varname> allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use <literal>company</literal>, <literal>counsel</literal>, <literal>flycheck</literal>, <literal>ivy</literal>, <literal>magit</literal>, <literal>projectile</literal>, and <literal>use-package</literal> you could use this as a <filename>~/.config/nixpkgs/config.nix</filename> override: </para> <screen> @@ -78,15 +48,7 @@ </screen> <para> - You can install it like any other packages via <command>nix-env -iA - myEmacs</command>. However, this will only install those packages. It will - not <literal>configure</literal> them for us. To do this, we need to - provide a configuration file. Luckily, it is possible to do this from - within Nix! By modifying the above example, we can make Emacs load a custom - config file. The key is to create a package that provide a - <filename>default.el</filename> file in - <filename>/share/emacs/site-start/</filename>. Emacs knows to load this - file automatically when it starts. + You can install it like any other packages via <command>nix-env -iA myEmacs</command>. However, this will only install those packages. It will not <literal>configure</literal> them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a <filename>default.el</filename> file in <filename>/share/emacs/site-start/</filename>. Emacs knows to load this file automatically when it starts. </para> <screen> @@ -168,22 +130,11 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el </screen> <para> - This provides a fairly full Emacs start file. It will load in addition to - the user's presonal config. You can always disable it by passing - <command>-q</command> to the Emacs command. + This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing <command>-q</command> to the Emacs command. </para> <para> - Sometimes <varname>emacsWithPackages</varname> is not enough, as this - package set has some priorities imposed on packages (with the lowest - priority assigned to Melpa Unstable, and the highest for packages manually - defined in <filename>pkgs/top-level/emacs-packages.nix</filename>). But you - can't control this priorities when some package is installed as a - dependency. You can override it on per-package-basis, providing all the - required dependencies manually - but it's tedious and there is always a - possibility that an unwanted dependency will sneak in through some other - package. To completely override such a package you can use - <varname>overrideScope'</varname>. + Sometimes <varname>emacsWithPackages</varname> is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in <filename>pkgs/top-level/emacs-packages.nix</filename>). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use <varname>overrideScope'</varname>. </para> <screen> @@ -203,23 +154,18 @@ overrides = self: super: rec { <title>DLib</title> <para> - <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based - toolkit which provides several machine learning algorithms. + <link xlink:href="http://dlib.net/">DLib</link> is a modern, C++-based toolkit which provides several machine learning algorithms. </para> <section xml:id="compiling-without-avx-support"> <title>Compiling without AVX support</title> <para> - Especially older CPUs don't support - <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link> - (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by - DLib to optimize their algorithms. + Especially older CPUs don't support <link xlink:href="https://en.wikipedia.org/wiki/Advanced_Vector_Extensions">AVX</link> (<abbrev>Advanced Vector Extensions</abbrev>) instructions that are used by DLib to optimize their algorithms. </para> <para> - On the affected hardware errors like <literal>Illegal instruction</literal> - will occur. In those cases AVX support needs to be disabled: + On the affected hardware errors like <literal>Illegal instruction</literal> will occur. In those cases AVX support needs to be disabled: <programlisting>self: super: { dlib = super.dlib.override { avxSupport = false; }; }</programlisting> @@ -230,22 +176,11 @@ overrides = self: super: rec { <title>Unfree software</title> <para> - All users of Nixpkgs are free software users, and many users (and - developers) of Nixpkgs want to limit and tightly control their exposure to - unfree software. At the same time, many users need (or want) to run some - specific pieces of proprietary software. Nixpkgs includes some expressions - for unfree software packages. By default unfree software cannot be installed - and doesn’t show up in searches. To allow installing unfree software in a - single Nix invocation one can export - <literal>NIXPKGS_ALLOW_UNFREE=1</literal>. For a persistent solution, users - can set <literal>allowUnfree</literal> in the Nixpkgs configuration. + All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export <literal>NIXPKGS_ALLOW_UNFREE=1</literal>. For a persistent solution, users can set <literal>allowUnfree</literal> in the Nixpkgs configuration. </para> <para> - Fine-grained control is possible by defining - <literal>allowUnfreePredicate</literal> function in config; it takes the - <literal>mkDerivation</literal> parameter attrset and returns - <literal>true</literal> for unfree packages that should be allowed. + Fine-grained control is possible by defining <literal>allowUnfreePredicate</literal> function in config; it takes the <literal>mkDerivation</literal> parameter attrset and returns <literal>true</literal> for unfree packages that should be allowed. </para> </section> <section xml:id="sec-steam"> @@ -255,13 +190,7 @@ overrides = self: super: rec { <title>Steam in Nix</title> <para> - Steam is distributed as a <filename>.deb</filename> file, for now only as - an i686 package (the amd64 package only has documentation). When unpacked, - it has a script called <filename>steam</filename> that in Ubuntu (their - target distro) would go to <filename>/usr/bin </filename>. When run for the - first time, this script copies some files to the user's home, which include - another script that is the ultimate responsible for launching the steam - binary, which is also in $HOME. + Steam is distributed as a <filename>.deb</filename> file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called <filename>steam</filename> that in Ubuntu (their target distro) would go to <filename>/usr/bin </filename>. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. </para> <para> @@ -269,8 +198,7 @@ overrides = self: super: rec { <itemizedlist> <listitem> <para> - We don't have <filename>/bin/bash</filename> and many scripts point - there. Similarly for <filename>/usr/bin/python</filename> . + We don't have <filename>/bin/bash</filename> and many scripts point there. Similarly for <filename>/usr/bin/python</filename> . </para> </listitem> <listitem> @@ -280,8 +208,7 @@ overrides = self: super: rec { </listitem> <listitem> <para> - The <filename>steam.sh</filename> script in $HOME can not be patched, as - it is checked and rewritten by steam. + The <filename>steam.sh</filename> script in $HOME can not be patched, as it is checked and rewritten by steam. </para> </listitem> <listitem> @@ -293,11 +220,7 @@ overrides = self: super: rec { </para> <para> - The current approach to deploy Steam in NixOS is composing a FHS-compatible - chroot environment, as documented - <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>. - This allows us to have binaries in the expected paths without disrupting - the system, and to avoid patching them to work in a non FHS environment. + The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. </para> </section> @@ -309,9 +232,7 @@ overrides = self: super: rec { <programlisting>hardware.opengl.driSupport32Bit = true;</programlisting> in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting> - if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller or other Steam supported controllers such as - the DualShock 4 or Nintendo Switch Pro, you need to add + if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add <programlisting>hardware.steam-hardware.enable = true;</programlisting> to your configuration. </para> @@ -342,19 +263,14 @@ overrides = self: super: rec { <itemizedlist> <listitem> <para> - The <literal>newStdcpp</literal> parameter was removed since NixOS - 17.09 and should not be needed anymore. + The <literal>newStdcpp</literal> parameter was removed since NixOS 17.09 and should not be needed anymore. </para> </listitem> <listitem> <para> - Steam ships statically linked with a version of libcrypto that - conflics with the one dynamically loaded by radeonsi_dri.so. If you - get the error + Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error <programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting> - have a look at - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this - pull request</link>. + have a look at <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this pull request</link>. </para> </listitem> </itemizedlist> @@ -368,8 +284,7 @@ overrides = self: super: rec { <orderedlist> <listitem> <para> - There is no java in steam chrootenv by default. If you get a message - like + There is no java in steam chrootenv by default. If you get a message like <programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting> You need to add <programlisting> steam.override { withJava = true; };</programlisting> @@ -387,8 +302,7 @@ overrides = self: super: rec { <title>steam-run</title> <para> - The FHS-compatible chroot used for steam can also be used to run other - linux games that expect a FHS environment. To do it, add + The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add <programlisting>pkgs.(steam.override { nativeOnly = true; newStdcpp = true; @@ -404,46 +318,23 @@ overrides = self: super: rec { <para> <note> <para> - Please note that the <literal>citrix_receiver</literal> package has been - deprecated since its development was - <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued - by upstream</link> and has been replaced by - <link xlink:href="https://www.citrix.com/products/workspace-app/">the - citrix workspace app</link>. + Please note that the <literal>citrix_receiver</literal> package has been deprecated since its development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link> and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>. </para> </note> - <link xlink:href="https://www.citrix.com/products/receiver/">Citrix - Receiver</link> and - <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix - Workspace App</link> are a remote desktop viewers which provide access to - <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> - installations. + <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and <link xlink:href="https://www.citrix.com/products/workspace-app/">Citrix Workspace App</link> are a remote desktop viewers which provide access to <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> installations. </para> <section xml:id="sec-citrix-base"> <title>Basic usage</title> <para> - The tarball archive needs to be downloaded manually as the license - agreements of the vendor for - <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix - Receiver</link> or - <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix - Workspace</link> need to be accepted first. Then run - <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>. - With the archive available in the store the package can be built and - installed with Nix. + The tarball archive needs to be downloaded manually as the license agreements of the vendor for <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">Citrix Receiver</link> or <link xlink:href="https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html">Citrix Workspace</link> need to be accepted first. Then run <command>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</command>. With the archive available in the store the package can be built and installed with Nix. </para> <warning> <title>Caution with <command>nix-shell</command> installs</title> <para> - It's recommended to install <literal>Citrix Receiver</literal> and/or - <literal>Citrix Workspace</literal> using <literal>nix-env -i</literal> or - globally to ensure that the <literal>.desktop</literal> files are - installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it - won't be possible to open <literal>.ica</literal> files automatically from - the browser to start a Citrix connection. + It's recommended to install <literal>Citrix Receiver</literal> and/or <literal>Citrix Workspace</literal> using <literal>nix-env -i</literal> or globally to ensure that the <literal>.desktop</literal> files are installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't be possible to open <literal>.ica</literal> files automatically from the browser to start a Citrix connection. </para> </warning> </section> @@ -452,17 +343,7 @@ overrides = self: super: rec { <title>Custom certificates</title> <para> - The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal> - trust several certificates - <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the - Mozilla database</link> by default. However several companies using Citrix - might require their own corporate certificate. On distros with imperative - packaging these certs can be stored easily in - <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>, - however this directory is a store path in <literal>nixpkgs</literal>. In - order to work around this issue the package provides a simple mechanism to - add custom certificates without rebuilding the entire package using - <literal>symlinkJoin</literal>: + The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal> trust several certificates <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the Mozilla database</link> by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>, however this directory is a store path in <literal>nixpkgs</literal>. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using <literal>symlinkJoin</literal>: <programlisting> <![CDATA[with import <nixpkgs> { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index 157d3fe2fcd..d8d7692fc9a 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -12,12 +12,7 @@ <itemizedlist> <listitem> <para> - The Darwin <literal>stdenv</literal> uses clang instead of gcc. When - referring to the compiler <varname>$CC</varname> or <command>cc</command> - will work in both cases. Some builds hardcode gcc/g++ in their build - scripts, that can usually be fixed with using something like - <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build - scripts. + The Darwin <literal>stdenv</literal> uses clang instead of gcc. When referring to the compiler <varname>$CC</varname> or <command>cc</command> will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build scripts. </para> <programlisting> stdenv.mkDerivation { @@ -31,12 +26,7 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - On Darwin, libraries are linked using absolute paths, libraries are - resolved by their <literal>install_name</literal> at link time. Sometimes - packages won't set this correctly causing the library lookups to fail at - runtime. This can be fixed by adding extra linker flags or by running - <command>install_name_tool -id</command> during the - <function>fixupPhase</function>. + On Darwin, libraries are linked using absolute paths, libraries are resolved by their <literal>install_name</literal> at link time. Sometimes packages won't set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running <command>install_name_tool -id</command> during the <function>fixupPhase</function>. </para> <programlisting> stdenv.mkDerivation { @@ -48,16 +38,10 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - Even if the libraries are linked using absolute paths and resolved via - their <literal>install_name</literal> correctly, tests can sometimes fail - to run binaries. This happens because the <varname>checkPhase</varname> - runs before the libraries are installed. + Even if the libraries are linked using absolute paths and resolved via their <literal>install_name</literal> correctly, tests can sometimes fail to run binaries. This happens because the <varname>checkPhase</varname> runs before the libraries are installed. </para> <para> - This can usually be solved by running the tests after the - <varname>installPhase</varname> or alternatively by using - <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable - can be found in the <citerefentry> + This can usually be solved by running the tests after the <varname>installPhase</varname> or alternatively by using <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable can be found in the <citerefentry> <refentrytitle>dyld</refentrytitle> <manvolnum>1</manvolnum></citerefentry> manpage. </para> @@ -78,11 +62,7 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - Some packages assume xcode is available and use <command>xcrun</command> - to resolve build tools like <command>clang</command>, etc. This causes - errors like <code>xcode-select: error: no developer tools were found at - '/Applications/Xcode.app'</code> while the build doesn't actually depend - on xcode. + Some packages assume xcode is available and use <command>xcrun</command> to resolve build tools like <command>clang</command>, etc. This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code> while the build doesn't actually depend on xcode. </para> <programlisting> stdenv.mkDerivation { @@ -95,9 +75,7 @@ stdenv.mkDerivation { } </programlisting> <para> - The package <literal>xcbuild</literal> can be used to build projects that - really depend on Xcode. However, this replacement is not 100% compatible - with Xcode and can occasionally cause issues. + The package <literal>xcbuild</literal> can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. </para> </listitem> </itemizedlist> diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 39e3e7396bd..80514cba490 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -15,120 +15,75 @@ </listitem> <listitem> <para> - Find a good place in the Nixpkgs tree to add the Nix expression for your - package. For instance, a library package typically goes into - <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>, - while a web browser goes into - <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>. - See <xref linkend="sec-organisation" /> for some hints on the tree - organisation. Create a directory for your package, e.g. + Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>, while a web browser goes into <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>. See <xref linkend="sec-organisation" /> for some hints on the tree organisation. Create a directory for your package, e.g. <screen> <prompt>$ </prompt>mkdir pkgs/development/libraries/libfoo</screen> </para> </listitem> <listitem> <para> - In the package directory, create a Nix expression — a piece of code that - describes how to build the package. In this case, it should be a - <emphasis>function</emphasis> that is called with the package dependencies - as arguments, and returns a build of the package in the Nix store. The - expression should usually be called <filename>default.nix</filename>. + In the package directory, create a Nix expression — a piece of code that describes how to build the package. In this case, it should be a <emphasis>function</emphasis> that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. The expression should usually be called <filename>default.nix</filename>. <screen> <prompt>$ </prompt>emacs pkgs/development/libraries/libfoo/default.nix <prompt>$ </prompt>git add pkgs/development/libraries/libfoo/default.nix</screen> </para> <para> - You can have a look at the existing Nix expressions under - <filename>pkgs/</filename> to see how it’s done. Here are some good - ones: + You can have a look at the existing Nix expressions under <filename>pkgs/</filename> to see how it’s done. Here are some good ones: <itemizedlist> <listitem> <para> - GNU Hello: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>. - Trivial package, which specifies some <varname>meta</varname> - attributes which is good practice. + GNU Hello: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>. Trivial package, which specifies some <varname>meta</varname> attributes which is good practice. </para> </listitem> <listitem> <para> - GNU cpio: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>. - Also a simple package. The generic builder in <varname>stdenv</varname> - does everything for you. It has no dependencies beyond - <varname>stdenv</varname>. + GNU cpio: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>. Also a simple package. The generic builder in <varname>stdenv</varname> does everything for you. It has no dependencies beyond <varname>stdenv</varname>. </para> </listitem> <listitem> <para> - GNU Multiple Precision arithmetic library (GMP): - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>. - Also done by the generic builder, but has a dependency on - <varname>m4</varname>. + GNU Multiple Precision arithmetic library (GMP): <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>. Also done by the generic builder, but has a dependency on <varname>m4</varname>. </para> </listitem> <listitem> <para> - Pan, a GTK-based newsreader: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>. - Has an optional dependency on <varname>gtkspell</varname>, which is - only built if <varname>spellCheck</varname> is <literal>true</literal>. + Pan, a GTK-based newsreader: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>. Has an optional dependency on <varname>gtkspell</varname>, which is only built if <varname>spellCheck</varname> is <literal>true</literal>. </para> </listitem> <listitem> <para> - Apache HTTPD: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>. - A bunch of optional features, variable substitutions in the configure - flags, a post-install hook, and miscellaneous hackery. + Apache HTTPD: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. </para> </listitem> <listitem> <para> - Thunderbird: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>. - Lots of dependencies. + Thunderbird: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>. Lots of dependencies. </para> </listitem> <listitem> <para> - JDiskReport, a Java utility: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link> - (and the - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>). - Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet - so this is pretty ad-hoc. + JDiskReport, a Java utility: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link> (and the <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>). Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet so this is pretty ad-hoc. </para> </listitem> <listitem> <para> - XML::Simple, a Perl module: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link> - (search for the <varname>XMLSimple</varname> attribute). Most Perl - modules are so simple to build that they are defined directly in - <filename>perl-packages.nix</filename>; no need to make a separate file - for them. + XML::Simple, a Perl module: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link> (search for the <varname>XMLSimple</varname> attribute). Most Perl modules are so simple to build that they are defined directly in <filename>perl-packages.nix</filename>; no need to make a separate file for them. </para> </listitem> <listitem> <para> - Adobe Reader: - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>. - Shows how binary-only packages can be supported. In particular the - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link> - uses <command>patchelf</command> to set the RUNPATH and ELF interpreter - of the executables so that the right libraries are found at runtime. + Adobe Reader: <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>. Shows how binary-only packages can be supported. In particular the <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link> uses <command>patchelf</command> to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. </para> </listitem> </itemizedlist> @@ -138,67 +93,45 @@ <itemizedlist> <listitem> <para> - All <varname linkend="chap-meta">meta</varname> attributes are - optional, but it’s still a good idea to provide at least the - <varname>description</varname>, <varname>homepage</varname> and - <varname + All <varname linkend="chap-meta">meta</varname> attributes are optional, but it’s still a good idea to provide at least the <varname>description</varname>, <varname>homepage</varname> and <varname linkend="sec-meta-license">license</varname>. </para> </listitem> <listitem> <para> - You can use <command>nix-prefetch-url</command> - <replaceable>url</replaceable> to get the SHA-256 hash of source - distributions. There are similar commands as - <command>nix-prefetch-git</command> and - <command>nix-prefetch-hg</command> available in - <literal>nix-prefetch-scripts</literal> package. + You can use <command>nix-prefetch-url</command> <replaceable>url</replaceable> to get the SHA-256 hash of source distributions. There are similar commands as <command>nix-prefetch-git</command> and <command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package. </para> </listitem> <listitem> <para> - A list of schemes for <literal>mirror://</literal> URLs can be found in - <link + A list of schemes for <literal>mirror://</literal> URLs can be found in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>. </para> </listitem> </itemizedlist> </para> <para> - The exact syntax and semantics of the Nix expression language, including - the built-in function, are described in the Nix manual in the - <link - xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter - on writing Nix expressions</link>. + The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the <link + xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions</link>. </para> </listitem> <listitem> <para> - Add a call to the function defined in the previous step to - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link> - with some descriptive name for the variable, e.g. - <varname>libfoo</varname>. + Add a call to the function defined in the previous step to <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link> with some descriptive name for the variable, e.g. <varname>libfoo</varname>. <screen> <prompt>$ </prompt>emacs pkgs/top-level/all-packages.nix</screen> </para> <para> - The attributes in that file are sorted by category (like “Development / - Libraries”) that more-or-less correspond to the directory structure of - Nixpkgs, and then by attribute name. + The attributes in that file are sorted by category (like “Development / Libraries”) that more-or-less correspond to the directory structure of Nixpkgs, and then by attribute name. </para> </listitem> <listitem> <para> - To test whether the package builds, run the following command from the - root of the nixpkgs source tree: + To test whether the package builds, run the following command from the root of the nixpkgs source tree: <screen> <prompt>$ </prompt>nix-build -A libfoo</screen> - where <varname>libfoo</varname> should be the variable name defined in the - previous step. You may want to add the flag <option>-K</option> to keep - the temporary build directory in case something fails. If the build - succeeds, a symlink <filename>./result</filename> to the package in the - Nix store is created. + where <varname>libfoo</varname> should be the variable name defined in the previous step. You may want to add the flag <option>-K</option> to keep the temporary build directory in case something fails. If the build succeeds, a symlink <filename>./result</filename> to the package in the Nix store is created. </para> </listitem> <listitem> @@ -210,14 +143,9 @@ </listitem> <listitem> <para> - Optionally commit the new package and open a pull request - <link - xlink:href="https://github.com/NixOS/nixpkgs/pulls">to - nixpkgs</link>, or use - <link - xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477"> - the Patches category</link> on Discourse for sending a patch without a - GitHub account. + Optionally commit the new package and open a pull request <link + xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or use <link + xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477"> the Patches category</link> on Discourse for sending a patch without a GitHub account. </para> </listitem> </orderedlist> diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 8d9b1813010..b85f61da079 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -6,15 +6,11 @@ <title>Release 0.14 (June 4, 2012)</title> <para> - In preparation for the switch from Subversion to Git, this release is mainly - the prevent the Nixpkgs version number from going backwards. (This would - happen because prerelease version numbers produced for the Git repository - are lower than those for the Subversion repository.) + In preparation for the switch from Subversion to Git, this release is mainly the prevent the Nixpkgs version number from going backwards. (This would happen because prerelease version numbers produced for the Git repository are lower than those for the Subversion repository.) </para> <para> - Since the last release, there have been thousands of changes and new - packages by numerous contributors. For details, see the commit logs. + Since the last release, there have been thousands of changes and new packages by numerous contributors. For details, see the commit logs. </para> </section> <section xml:id="release-notes-0.13"> @@ -55,14 +51,11 @@ <title>Release 0.12 (April 24, 2009)</title> <para> - There are way too many additions to Nixpkgs since the last release to list - here: for example, the number of packages on Linux has increased from 1002 - to 2159. However, some specific improvements are worth listing: + There are way too many additions to Nixpkgs since the last release to list here: for example, the number of packages on Linux has increased from 1002 to 2159. However, some specific improvements are worth listing: <itemizedlist> <listitem> <para> - Nixpkgs now has a manual. In particular, it describes the standard build - environment in detail. + Nixpkgs now has a manual. In particular, it describes the standard build environment in detail. </para> </listitem> <listitem> @@ -122,9 +115,7 @@ </listitem> <listitem> <para> - Support for building derivations in a virtual machine, including RPM and - Debian builds in automatically generated VM images. See - <filename>pkgs/build-support/vm/default.nix</filename> for details. + Support for building derivations in a virtual machine, including RPM and Debian builds in automatically generated VM images. See <filename>pkgs/build-support/vm/default.nix</filename> for details. </para> </listitem> <listitem> @@ -136,13 +127,7 @@ </para> <para> - The following people contributed to this release: Andres Löh, Arie - Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, - Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas - Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias - Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In - addition, several people contributed patches on the - <literal>nix-dev</literal> mailing list. + The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In addition, several people contributed patches on the <literal>nix-dev</literal> mailing list. </para> </section> <section xml:id="release-notes-0.11"> @@ -153,25 +138,12 @@ <itemizedlist> <listitem> <para> - The standard build environment (<literal>stdenv</literal>) is now pure on - the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal> - platforms, just as on <literal>i686-linux</literal>. (Purity means that - building and using the standard environment has no dependencies outside - of the Nix store. For instance, it doesn’t require an external C - compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically - linked binaries used in the bootstrap process are now automatically - reproducible, making it easy to update the bootstrap tools and to add - support for other Linux platforms. See - <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for - details. + The standard build environment (<literal>stdenv</literal>) is now pure on the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal> platforms, just as on <literal>i686-linux</literal>. (Purity means that building and using the standard environment has no dependencies outside of the Nix store. For instance, it doesn’t require an external C compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically linked binaries used in the bootstrap process are now automatically reproducible, making it easy to update the bootstrap tools and to add support for other Linux platforms. See <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for details. </para> </listitem> <listitem> <para> - Hook variables in the generic builder are now executed using the - <function>eval</function> shell command. This has a major advantage: you - can write hooks directly in Nix expressions. For instance, rather than - writing a builder like this: + Hook variables in the generic builder are now executed using the <function>eval</function> shell command. This has a major advantage: you can write hooks directly in Nix expressions. For instance, rather than writing a builder like this: <programlisting> source $stdenv/setup @@ -182,91 +154,57 @@ postInstall() { } genericBuild</programlisting> - (the <literal>gzip</literal> builder), you can just add this attribute to - the derivation: + (the <literal>gzip</literal> builder), you can just add this attribute to the derivation: <programlisting> postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";</programlisting> - and so a separate build script becomes unnecessary. This should allow us - to get rid of most builders in Nixpkgs. + and so a separate build script becomes unnecessary. This should allow us to get rid of most builders in Nixpkgs. </para> </listitem> <listitem> <para> - It is now possible to have the generic builder pass arguments to - <command>configure</command> and <command>make</command> that contain - whitespace. Previously, for example, you could say in a builder, + It is now possible to have the generic builder pass arguments to <command>configure</command> and <command>make</command> that contain whitespace. Previously, for example, you could say in a builder, <programlisting> configureFlags="CFLAGS=-O0"</programlisting> but not <programlisting> configureFlags="CFLAGS=-O0 -g"</programlisting> - since the <literal>-g</literal> would be interpreted as a separate - argument to <command>configure</command>. Now you can say + since the <literal>-g</literal> would be interpreted as a separate argument to <command>configure</command>. Now you can say <programlisting> configureFlagsArray=("CFLAGS=-O0 -g")</programlisting> or similarly <programlisting> configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")</programlisting> - which does the right thing. Idem for <literal>makeFlags</literal>, - <literal>installFlags</literal>, <literal>checkFlags</literal> and - <literal>distFlags</literal>. + which does the right thing. Idem for <literal>makeFlags</literal>, <literal>installFlags</literal>, <literal>checkFlags</literal> and <literal>distFlags</literal>. </para> <para> - Unfortunately you can't pass arrays to Bash through the environment, so - you can't put the array above in a Nix expression, e.g., + Unfortunately you can't pass arrays to Bash through the environment, so you can't put the array above in a Nix expression, e.g., <programlisting> configureFlagsArray = ["CFLAGS=-O0 -g"];</programlisting> - since it would just be flattened to a since string. However, you - <emphasis>can</emphasis> use the inline hooks described above: + since it would just be flattened to a since string. However, you <emphasis>can</emphasis> use the inline hooks described above: <programlisting> preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting> </para> </listitem> <listitem> <para> - The function <function>fetchurl</function> now has support for two - different kinds of mirroring of files. First, it has support for - <emphasis>content-addressable mirrors</emphasis>. For example, given the - <function>fetchurl</function> call + The function <function>fetchurl</function> now has support for two different kinds of mirroring of files. First, it has support for <emphasis>content-addressable mirrors</emphasis>. For example, given the <function>fetchurl</function> call <programlisting> fetchurl { url = http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2; sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; }</programlisting> - <function>fetchurl</function> will first try to download this file from - <link - xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. - If that file doesn’t exist, it will try the original URL. In general, - the “content-addressed” location is - <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>. - There is currently only one content-addressable mirror - (<link - xlink:href="http://tarballs.nixos.org"/>), but more can be - specified in the <varname>hashedMirrors</varname> attribute in - <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by - setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a - whitespace-separated list of URLs. + <function>fetchurl</function> will first try to download this file from <link + xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>. There is currently only one content-addressable mirror (<link + xlink:href="http://tarballs.nixos.org"/>), but more can be specified in the <varname>hashedMirrors</varname> attribute in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a whitespace-separated list of URLs. </para> <para> - Second, <function>fetchurl</function> has support for widely-mirrored - distribution sites such as SourceForge or the Linux kernel archives. - Given a URL of the form - <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>, - it will try to download <replaceable>path</replaceable> from a - configurable list of mirrors for <replaceable>site</replaceable>. (This - idea was borrowed from Gentoo Linux.) Example: + Second, <function>fetchurl</function> has support for widely-mirrored distribution sites such as SourceForge or the Linux kernel archives. Given a URL of the form <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>, it will try to download <replaceable>path</replaceable> from a configurable list of mirrors for <replaceable>site</replaceable>. (This idea was borrowed from Gentoo Linux.) Example: <programlisting> fetchurl { url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2; sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1"; }</programlisting> - Currently <replaceable>site</replaceable> can be - <literal>sourceforge</literal>, <literal>gnu</literal> and - <literal>kernel</literal>. The list of mirrors is defined in - <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can - override the list of mirrors for a particular site by setting the - environment variable - <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g. + Currently <replaceable>site</replaceable> can be <literal>sourceforge</literal>, <literal>gnu</literal> and <literal>kernel</literal>. The list of mirrors is defined in <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can override the list of mirrors for a particular site by setting the environment variable <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g. <programlisting> export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</programlisting> </para> @@ -339,9 +277,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog </para> <para> - The following people contributed to this release: Andres Löh, Arie - Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin - Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. + The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. </para> </section> <section xml:id="release-notes-0.10"> @@ -349,10 +285,8 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog <note> <para> - This release of Nixpkgs requires - <link -xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> - or higher. + This release of Nixpkgs requires <link +xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> or higher. </para> </note> @@ -363,32 +297,15 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> <itemizedlist> <listitem> <para> - <filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now - just have <filename>pkgs/top-level/all-packages.nix</filename> that - contains all available packages. This should cause much less confusion - with users. <filename>all-packages.nix</filename> is a function that by - default returns packages for the current platform, but you can override - this by specifying a different <varname>system</varname> argument. + <filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now just have <filename>pkgs/top-level/all-packages.nix</filename> that contains all available packages. This should cause much less confusion with users. <filename>all-packages.nix</filename> is a function that by default returns packages for the current platform, but you can override this by specifying a different <varname>system</varname> argument. </para> </listitem> <listitem> <para> - Certain packages in Nixpkgs are now user-configurable through a - configuration file, i.e., without having to edit the Nix expressions in - Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is - built without the RealPlayer plugin (for legal reasons). Previously, you - could easily enable RealPlayer support by editing the call to the Firefox - function in <filename>all-packages.nix</filename>, but such changes are - not respected when Firefox is subsequently updated through the Nixpkgs - channel. + Certain packages in Nixpkgs are now user-configurable through a configuration file, i.e., without having to edit the Nix expressions in Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is built without the RealPlayer plugin (for legal reasons). Previously, you could easily enable RealPlayer support by editing the call to the Firefox function in <filename>all-packages.nix</filename>, but such changes are not respected when Firefox is subsequently updated through the Nixpkgs channel. </para> <para> - The Nixpkgs configuration file (found in - <filename>~/.nixpkgs/config.nix</filename> or through the - <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set - that contains configuration options that - <filename>all-packages.nix</filename> reads and uses for certain packages. - For instance, the following configuration file: + The Nixpkgs configuration file (found in <filename>~/.nixpkgs/config.nix</filename> or through the <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set that contains configuration options that <filename>all-packages.nix</filename> reads and uses for certain packages. For instance, the following configuration file: <programlisting> { firefox = { @@ -398,9 +315,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> persistently enables RealPlayer support in the Firefox build. </para> <para> - (Actually, <literal>firefox.enableRealPlayer</literal> is the - <emphasis>only</emphasis> configuration option currently available, but - more are sure to be added.) + (Actually, <literal>firefox.enableRealPlayer</literal> is the <emphasis>only</emphasis> configuration option currently available, but more are sure to be added.) </para> </listitem> <listitem> @@ -409,17 +324,8 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> <itemizedlist> <listitem> <para> - <literal>i686-cygwin</literal>, i.e., Windows (using - <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard - environment on <literal>i686-cygwin</literal> by default builds - binaries for the Cygwin environment (i.e., it uses Cygwin tools and - produces executables that use the Cygwin library). However, there is - also a standard environment that produces binaries that use - <link - xlink:href="http://www.mingw.org/">MinGW</link>. You can - use it by calling <filename>all-package.nix</filename> with the - <varname>stdenvType</varname> argument set to - <literal>"i686-mingw"</literal>. + <literal>i686-cygwin</literal>, i.e., Windows (using <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard environment on <literal>i686-cygwin</literal> by default builds binaries for the Cygwin environment (i.e., it uses Cygwin tools and produces executables that use the Cygwin library). However, there is also a standard environment that produces binaries that use <link + xlink:href="http://www.mingw.org/">MinGW</link>. You can use it by calling <filename>all-package.nix</filename> with the <varname>stdenvType</varname> argument set to <literal>"i686-mingw"</literal>. </para> </listitem> <listitem> @@ -434,9 +340,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> </listitem> <listitem> <para> - <literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs. - Unlike <literal>i686-linux</literal>, this platform doesn’t have a - pure <literal>stdenv</literal> yet. + <literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs. Unlike <literal>i686-linux</literal>, this platform doesn’t have a pure <literal>stdenv</literal> yet. </para> </listitem> </itemizedlist> @@ -472,21 +376,10 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> </listitem> <listitem> <para> - It is now <emphasis>much</emphasis> easier to override the default C - compiler and other tools in <literal>stdenv</literal> for specific - packages. <filename>all-packages.nix</filename> provides two utility - functions for this purpose: <function>overrideGCC</function> and - <function>overrideInStdenv</function>. Both take a - <literal>stdenv</literal> and return an augmented - <literal>stdenv</literal>; the formed changes the C compiler, and the - latter adds additional packages to the front of - <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools - to be overridden. + It is now <emphasis>much</emphasis> easier to override the default C compiler and other tools in <literal>stdenv</literal> for specific packages. <filename>all-packages.nix</filename> provides two utility functions for this purpose: <function>overrideGCC</function> and <function>overrideInStdenv</function>. Both take a <literal>stdenv</literal> and return an augmented <literal>stdenv</literal>; the formed changes the C compiler, and the latter adds additional packages to the front of <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools to be overridden. </para> <para> - For instance, the package <varname>strategoxt</varname> doesn’t build - with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call - it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80: + For instance, the package <varname>strategoxt</varname> doesn’t build with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80: <programlisting> strategoxt = (import ../development/compilers/strategoxt) { inherit fetchurl pkgconfig sdf aterm; @@ -494,8 +387,7 @@ strategoxt = (import ../development/compilers/strategoxt) { }; gnumake380 = <replaceable>...</replaceable>;</programlisting> - Likewise, there are many packages that don’t compile with the default - GCC (4.1.1), but that’s easily fixed: + Likewise, there are many packages that don’t compile with the default GCC (4.1.1), but that’s easily fixed: <programlisting> exult = import ../games/exult { inherit fetchurl SDL SDL_mixer zlib libpng unzip; @@ -505,13 +397,7 @@ exult = import ../games/exult { </listitem> <listitem> <para> - It has also become much easier to experiment with changes to the - <literal>stdenv</literal> setup script (which notably contains the generic - builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename> - trigger a rebuild of <emphasis>everything</emphasis>, this was formerly - quite painful. But now <literal>stdenv</literal> contains a function to - “regenerate” <literal>stdenv</literal> with a different setup script, - allowing the use of a different setup script for specific packages: + It has also become much easier to experiment with changes to the <literal>stdenv</literal> setup script (which notably contains the generic builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename> trigger a rebuild of <emphasis>everything</emphasis>, this was formerly quite painful. But now <literal>stdenv</literal> contains a function to “regenerate” <literal>stdenv</literal> with a different setup script, allowing the use of a different setup script for specific packages: <programlisting> pkg = import <replaceable>...</replaceable> { stdenv = stdenv.regenerate ./my-setup.sh; @@ -521,10 +407,7 @@ pkg = import <replaceable>...</replaceable> { </listitem> <listitem> <para> - Packages can now have a human-readable <emphasis>description</emphasis> - field. Package descriptions are shown by <literal>nix-env -qa - --description</literal>. In addition, they’re shown on the Nixpkgs - release page. A description can be added to a package as follows: + Packages can now have a human-readable <emphasis>description</emphasis> field. Package descriptions are shown by <literal>nix-env -qa --description</literal>. In addition, they’re shown on the Nixpkgs release page. A description can be added to a package as follows: <programlisting> stdenv.mkDerivation { name = "exult-1.2"; @@ -533,34 +416,26 @@ stdenv.mkDerivation { description = "A reimplementation of the Ultima VII game engine"; }; }</programlisting> - The <varname>meta</varname> attribute is not passed to the builder, so - changes to the description do not trigger a rebuild. Additional - <varname>meta</varname> attributes may be defined in the future (such as - the URL of the package’s homepage, the license, etc.). + The <varname>meta</varname> attribute is not passed to the builder, so changes to the description do not trigger a rebuild. Additional <varname>meta</varname> attributes may be defined in the future (such as the URL of the package’s homepage, the license, etc.). </para> </listitem> </itemizedlist> <para> - The following people contributed to this release: Andres Löh, Armijn Hemel, - Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin - Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. + The following people contributed to this release: Andres Löh, Armijn Hemel, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. </para> </section> <section xml:id="release-notes-0.9"> <title>Release 0.9 (January 31, 2006)</title> <para> - There have been zillions of changes since the last release of Nixpkgs. Many - packages have been added or updated. The following are some of the more - notable changes: + There have been zillions of changes since the last release of Nixpkgs. Many packages have been added or updated. The following are some of the more notable changes: </para> <itemizedlist> <listitem> <para> - Distribution files have been moved to - <link + Distribution files have been moved to <link xlink:href="http://nixos.org/" />. </para> </listitem> @@ -576,24 +451,17 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - The old, unofficial Xlibs has been replaced by the official modularised - X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) - packages, all of which are in Nixpkgs though not all have been tested. It - is now possible to build a working X server (previously we only had X - client libraries). We use a fully Nixified X server on NixOS. + The old, unofficial Xlibs has been replaced by the official modularised X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs though not all have been tested. It is now possible to build a working X server (previously we only had X client libraries). We use a fully Nixified X server on NixOS. </para> </listitem> <listitem> <para> - The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix - components such as <filename>/lib/ld-linux.so.2</filename>. This means - that Java applications such as Eclipse and Azureus can run on NixOS. + The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix components such as <filename>/lib/ld-linux.so.2</filename>. This means that Java applications such as Eclipse and Azureus can run on NixOS. </para> </listitem> <listitem> <para> - Hardware-accelerated OpenGL support, used by games like Quake 3 (which is - now built from source). + Hardware-accelerated OpenGL support, used by games like Quake 3 (which is now built from source). </para> </listitem> <listitem> @@ -608,8 +476,7 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - Some support for cross-compilation: cross-compiling builds of GCC and - Binutils, and cross-compiled builds of the C library uClibc. + Some support for cross-compilation: cross-compiling builds of GCC and Binutils, and cross-compiled builds of the C library uClibc. </para> </listitem> <listitem> @@ -618,8 +485,7 @@ stdenv.mkDerivation { <itemizedlist> <listitem> <para> - teTeX, including support for building LaTeX documents using Nix (with - automatic dependency determination). + teTeX, including support for building LaTeX documents using Nix (with automatic dependency determination). </para> </listitem> <listitem> @@ -629,14 +495,12 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - System-level packages to support NixOS, e.g. Grub, GNU - <literal>parted</literal> and so on. + System-level packages to support NixOS, e.g. Grub, GNU <literal>parted</literal> and so on. </para> </listitem> <listitem> <para> - <literal>ecj</literal>, the Eclipse Compiler for Java, so we finally - have a freely distributable compiler that supports Java 5.0. + <literal>ecj</literal>, the Eclipse Compiler for Java, so we finally have a freely distributable compiler that supports Java 5.0. </para> </listitem> <listitem> @@ -661,8 +525,7 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - <literal>kdelibs</literal>. This allows us to add KDE-based packages - (such as <literal>kcachegrind</literal>). + <literal>kdelibs</literal>. This allows us to add KDE-based packages (such as <literal>kcachegrind</literal>). </para> </listitem> </itemizedlist> @@ -671,17 +534,14 @@ stdenv.mkDerivation { </itemizedlist> <para> - The following people contributed to this release: Andres Löh, Armijn Hemel, - Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, - Martin Bravenboer, Rob Vermaas and Roy van den Broek. + The following people contributed to this release: Andres Löh, Armijn Hemel, Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Rob Vermaas and Roy van den Broek. </para> </section> <section xml:id="release-notes-0.8"> <title>Release 0.8 (April 11, 2005)</title> <para> - This release is mostly to remain synchronised with the changed hashing - scheme in Nix 0.8. + This release is mostly to remain synchronised with the changed hashing scheme in Nix 0.8. </para> <para> @@ -706,16 +566,10 @@ stdenv.mkDerivation { <itemizedlist> <listitem> <para> - The bootstrap process for the standard build environment on Linux - (stdenv-linux) has been improved. It is no longer dependent in its initial - bootstrap stages on the system Glibc, GCC, and other tools. Rather, - Nixpkgs contains a statically linked bash and curl, and uses that to - download other statically linked tools. These are then used to build a - Glibc and dynamically linked versions of all other tools. + The bootstrap process for the standard build environment on Linux (stdenv-linux) has been improved. It is no longer dependent in its initial bootstrap stages on the system Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically linked bash and curl, and uses that to download other statically linked tools. These are then used to build a Glibc and dynamically linked versions of all other tools. </para> <para> - This change also makes the bootstrap process faster. For instance, GCC is - built only once instead of three times. + This change also makes the bootstrap process faster. For instance, GCC is built only once instead of three times. </para> <para> (Contributed by Armijn Hemel.) @@ -723,17 +577,13 @@ stdenv.mkDerivation { </listitem> <listitem> <para> - Tarballs used by Nixpkgs are now obtained from the same server that hosts - Nixpkgs (<link - xlink:href="http://catamaran.labs.cs.uu.nl/" />). This - reduces the risk of packages being unbuildable due to moved or deleted - files on various servers. + Tarballs used by Nixpkgs are now obtained from the same server that hosts Nixpkgs (<link + xlink:href="http://catamaran.labs.cs.uu.nl/" />). This reduces the risk of packages being unbuildable due to moved or deleted files on various servers. </para> </listitem> <listitem> <para> - There now is a generic mechanism for building Perl modules. See the - various Perl modules defined in pkgs/system/all-packages-generic.nix. + There now is a generic mechanism for building Perl modules. See the various Perl modules defined in pkgs/system/all-packages-generic.nix. </para> </listitem> <listitem> diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 5aa950625ef..5a14684f9b1 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -6,68 +6,40 @@ <title>Reviewing contributions</title> <warning> <para> - The following section is a draft, and the policy for reviewing is still - being discussed in issues such as - <link - xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 - </link> and - <link - xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 - </link>. + The following section is a draft, and the policy for reviewing is still being discussed in issues such as <link + xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link + xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>. </para> </warning> <para> - The Nixpkgs project receives a fairly high number of contributions via GitHub - pull requests. Reviewing and approving these is an important task and a way - to contribute to the project. + The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project. </para> <para> - The high change rate of Nixpkgs makes any pull request that remains open for - too long subject to conflicts that will require extra work from the submitter - or the merger. Reviewing pull requests in a timely manner and being - responsive to the comments is the key to avoid this issue. GitHub provides - sort filters that can be used to see the - <link - xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most - recently</link> and the - <link - xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least - recently</link> updated pull requests. We highly encourage looking at - <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone"> - this list of ready to merge, unreviewed pull requests</link>. + The high change rate of Nixpkgs makes any pull request that remains open for too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid this issue. GitHub provides sort filters that can be used to see the <link + xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most recently</link> and the <link + xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least recently</link> updated pull requests. We highly encourage looking at <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone"> this list of ready to merge, unreviewed pull requests</link>. </para> <para> - When reviewing a pull request, please always be nice and polite. - Controversial changes can lead to controversial opinions, but it is important - to respect every community member and their work. + When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work. </para> <para> - GitHub provides reactions as a simple and quick way to provide feedback to - pull requests or any comments. The thumb-down reaction should be used with - care and if possible accompanied with some explanation so the submitter has - directions to improve their contribution. + GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution. </para> <para> - pull request reviews should include a list of what has been reviewed in a - comment, so other reviewers and mergers can know the state of the review. + pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review. </para> <para> - All the review template samples provided in this section are generic and - meant as examples. Their usage is optional and the reviewer is free to adapt - them to their liking. + All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking. </para> <section xml:id="reviewing-contributions-package-updates"> <title>Package updates</title> <para> - A package update is the most trivial and common type of pull request. These - pull requests mainly consist of updating the version part of the package - name and the source hash. + A package update is the most trivial and common type of pull request. These pull requests mainly consist of updating the version part of the package name and the source hash. </para> <para> - It can happen that non-trivial updates include patches or more complex - changes. + It can happen that non-trivial updates include patches or more complex changes. </para> <para> @@ -82,8 +54,7 @@ <itemizedlist> <listitem> <para> - <literal>8.has: package (update)</literal> and any topic label that fit - the updated package. + <literal>8.has: package (update)</literal> and any topic label that fit the updated package. </para> </listitem> </itemizedlist> @@ -105,9 +76,7 @@ <itemizedlist> <listitem> <para> - <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> - will make GitHub notify users based on the submitted changes, but it can - happen that it misses some of the package maintainers. + <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. </para> </listitem> </itemizedlist> @@ -119,15 +88,12 @@ <itemizedlist> <listitem> <para> - License can change with version updates, so it should be checked to - match the upstream license. + License can change with version updates, so it should be checked to match the upstream license. </para> </listitem> <listitem> <para> - If the package has no maintainer, a maintainer must be set. This can be - the update submitter or a community member that accepts to take - maintainership of the package. + If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package. </para> </listitem> </itemizedlist> @@ -144,14 +110,10 @@ <itemizedlist> <listitem> <para> - pull requests are often targeted to the master or staging branch, and - building the pull request locally when it is submitted can trigger many - source builds. + pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. </para> <para> - It is possible to rebase the changes on nixos-unstable or - nixpkgs-unstable for easier review by running the following commands - from a nixpkgs clone. + It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. <screen> <prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co xml:id='reviewing-rebase-1' /> @@ -163,8 +125,7 @@ <calloutlist> <callout arearefs='reviewing-rebase-1'> <para> - This should be done only once to be able to fetch channel branches - from the nixpkgs-channels repository. + This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository. </para> </callout> <callout arearefs='reviewing-rebase-2'> @@ -174,9 +135,7 @@ </callout> <callout arearefs='reviewing-rebase-3'> <para> - Fetching the pull request changes, <varname>PRNUMBER</varname> is the - number at the end of the pull request title and - <varname>BASEBRANCH</varname> the base branch of the pull request. + Fetching the pull request changes, <varname>PRNUMBER</varname> is the number at the end of the pull request title and <varname>BASEBRANCH</varname> the base branch of the pull request. </para> </callout> <callout arearefs='reviewing-rebase-4'> @@ -189,12 +148,7 @@ </listitem> <listitem> <para> - The - <link xlink:href="https://github.com/Mic92/nix-review">nix-review</link> - tool can be used to review a pull request content in a single command. - <varname>PRNUMBER</varname> should be replaced by the number at the end - of the pull request title. You can also provide the full github pull - request url. + The <link xlink:href="https://github.com/Mic92/nix-review">nix-review</link> tool can be used to review a pull request content in a single command. <varname>PRNUMBER</varname> should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url. </para> <screen> <prompt>$ </prompt>nix-shell -p nix-review --run "nix-review pr PRNUMBER" @@ -231,8 +185,7 @@ <title>New packages</title> <para> - New packages are a common type of pull requests. These pull requests - consists in adding a new nix-expression for a package. + New packages are a common type of pull requests. These pull requests consists in adding a new nix-expression for a package. </para> <para> @@ -247,8 +200,7 @@ <itemizedlist> <listitem> <para> - <literal>8.has: package (new)</literal> and any topic label that fit the - new package. + <literal>8.has: package (new)</literal> and any topic label that fit the new package. </para> </listitem> </itemizedlist> @@ -280,8 +232,7 @@ </listitem> <listitem> <para> - A maintainer must be set. This can be the package submitter or a - community member that accepts to take maintainership of the package. + A maintainer must be set. This can be the package submitter or a community member that accepts to take maintainership of the package. </para> </listitem> </itemizedlist> @@ -303,8 +254,7 @@ </listitem> <listitem> <para> - The most appropriate function should be used (e.g. packages from GitHub - should use <literal>fetchFromGitHub</literal>). + The most appropriate function should be used (e.g. packages from GitHub should use <literal>fetchFromGitHub</literal>). </para> </listitem> </itemizedlist> @@ -351,8 +301,7 @@ <title>Module updates</title> <para> - Module updates are submissions changing modules in some ways. These often - contains changes to the options or introduce new options. + Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options. </para> <para> @@ -367,8 +316,7 @@ <itemizedlist> <listitem> <para> - <literal>8.has: module (update)</literal> and any topic label that fit - the module. + <literal>8.has: module (update)</literal> and any topic label that fit the module. </para> </listitem> </itemizedlist> @@ -380,9 +328,7 @@ <itemizedlist> <listitem> <para> - <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> - will make GitHub notify users based on the submitted changes, but it can - happen that it misses some of the package maintainers. + <link xlink:href="https://help.github.com/articles/about-codeowners/">CODEOWNERS</link> will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. </para> </listitem> </itemizedlist> @@ -399,9 +345,7 @@ <itemizedlist> <listitem> <para> - Type should be appropriate (string related types differs in their - merging capabilities, <literal>optionSet</literal> and - <literal>string</literal> types are deprecated). + Type should be appropriate (string related types differs in their merging capabilities, <literal>optionSet</literal> and <literal>string</literal> types are deprecated). </para> </listitem> <listitem> @@ -418,23 +362,19 @@ <itemizedlist> <listitem> <para> - <literal>mkRenamedOptionModule</literal> and - <literal>mkAliasOptionModule</literal> functions provide way to make - option changes backward compatible. + <literal>mkRenamedOptionModule</literal> and <literal>mkAliasOptionModule</literal> functions provide way to make option changes backward compatible. </para> </listitem> </itemizedlist> </listitem> <listitem> <para> - Ensure that removed options are declared with - <literal>mkRemovedOptionModule</literal> + Ensure that removed options are declared with <literal>mkRemovedOptionModule</literal> </para> </listitem> <listitem> <para> - Ensure that changes that are not backward compatible are mentioned in - release notes. + Ensure that changes that are not backward compatible are mentioned in release notes. </para> </listitem> <listitem> @@ -480,8 +420,7 @@ <itemizedlist> <listitem> <para> - <literal>8.has: module (new)</literal> and any topic label that fit the - module. + <literal>8.has: module (new)</literal> and any topic label that fit the module. </para> </listitem> </itemizedlist> @@ -498,9 +437,7 @@ <itemizedlist> <listitem> <para> - Type should be appropriate (string related types differs in their - merging capabilities, <literal>optionSet</literal> and - <literal>string</literal> types are deprecated). + Type should be appropriate (string related types differs in their merging capabilities, <literal>optionSet</literal> and <literal>string</literal> types are deprecated). </para> </listitem> <listitem> @@ -522,8 +459,7 @@ </listitem> <listitem> <para> - Module documentation should be declared with - <literal>meta.doc</literal>. + Module documentation should be declared with <literal>meta.doc</literal>. </para> </listitem> </itemizedlist> @@ -535,8 +471,7 @@ <itemizedlist> <listitem> <para> - For example, enabling a module should not open firewall ports by - default. + For example, enabling a module should not open firewall ports by default. </para> </listitem> </itemizedlist> @@ -573,25 +508,18 @@ </para> <para> - If you consider having enough knowledge and experience in a topic and would - like to be a long-term reviewer for related submissions, please contact the - current reviewers for that topic. They will give you information about the - reviewing process. The main reviewers for a topic can be hard to find as - there is no list, but checking past pull requests to see who reviewed or - git-blaming the code to see who committed to that topic can give some hints. + If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints. </para> <para> - Container system, boot system and library changes are some examples of the - pull requests fitting this category. + Container system, boot system and library changes are some examples of the pull requests fitting this category. </para> </section> <section xml:id="reviewing-contributions--merging-pull-requests"> <title>Merging pull requests</title> <para> - It is possible for community members that have enough knowledge and - experience on a special topic to contribute by merging pull requests. + It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. </para> <para> @@ -608,12 +536,8 @@ policy. --> <para> - In a case a contributor definitively leaves the Nix community, they should - create an issue or post on - <link - xlink:href="https://discourse.nixos.org">Discourse</link> with - references of packages and modules they maintain so the maintainership can - be taken over by other contributors. + In a case a contributor definitively leaves the Nix community, they should create an issue or post on <link + xlink:href="https://discourse.nixos.org">Discourse</link> with references of packages and modules they maintain so the maintainership can be taken over by other contributors. </para> </section> </chapter> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a4bc2809be0..5495ce29ce3 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -3,22 +3,13 @@ xml:id="chap-stdenv"> <title>The Standard Environment</title> <para> - The standard build environment in the Nix Packages collection provides an - environment for building Unix packages that does a lot of common build tasks - automatically. In fact, for Unix packages that use the standard - <literal>./configure; make; make install</literal> build interface, you - don’t need to write a build script at all; the standard environment does - everything automatically. If <literal>stdenv</literal> doesn’t do what you - need automatically, you can easily customise or override the various build - phases. + The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard <literal>./configure; make; make install</literal> build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If <literal>stdenv</literal> doesn’t do what you need automatically, you can easily customise or override the various build phases. </para> <section xml:id="sec-using-stdenv"> <title>Using <literal>stdenv</literal></title> <para> - To build a package with the standard environment, you use the function - <varname>stdenv.mkDerivation</varname>, instead of the primitive built-in - function <varname>derivation</varname>, e.g. + To build a package with the standard environment, you use the function <varname>stdenv.mkDerivation</varname>, instead of the primitive built-in function <varname>derivation</varname>, e.g. <programlisting> stdenv.mkDerivation { name = "libfoo-1.2.3"; @@ -27,17 +18,7 @@ stdenv.mkDerivation { sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; }; }</programlisting> - (<varname>stdenv</varname> needs to be in scope, so if you write this in a - separate Nix expression from <filename>pkgs/all-packages.nix</filename>, you - need to pass it as a function argument.) Specifying a - <varname>name</varname> and a <varname>src</varname> is the absolute minimum - Nix requires. For convenience, you can also use <varname>pname</varname> and - <varname>version</varname> attributes and <literal>mkDerivation</literal> - will automatically set <varname>name</varname> to - <literal>"${pname}-${version}"</literal> by default. Since - <link xlink:href="https://github.com/NixOS/rfcs/pull/35">RFC 0035</link>, - this is preferred for packages in Nixpkgs, as it allows us to reuse the - version easily: + (<varname>stdenv</varname> needs to be in scope, so if you write this in a separate Nix expression from <filename>pkgs/all-packages.nix</filename>, you need to pass it as a function argument.) Specifying a <varname>name</varname> and a <varname>src</varname> is the absolute minimum Nix requires. For convenience, you can also use <varname>pname</varname> and <varname>version</varname> attributes and <literal>mkDerivation</literal> will automatically set <varname>name</varname> to <literal>"${pname}-${version}"</literal> by default. Since <link xlink:href="https://github.com/NixOS/rfcs/pull/35">RFC 0035</link>, this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily: <programlisting> stdenv.mkDerivation rec { pname = "libfoo"; @@ -50,31 +31,18 @@ stdenv.mkDerivation rec { </para> <para> - Many packages have dependencies that are not provided in the standard - environment. It’s usually sufficient to specify those dependencies in the - <varname>buildInputs</varname> attribute: + Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the <varname>buildInputs</varname> attribute: <programlisting> stdenv.mkDerivation { name = "libfoo-1.2.3"; ... buildInputs = [libbar perl ncurses]; }</programlisting> - This attribute ensures that the <filename>bin</filename> subdirectories of - these packages appear in the <envar>PATH</envar> environment variable during - the build, that their <filename>include</filename> subdirectories are - searched by the C compiler, and so on. (See - <xref linkend="ssec-setup-hooks"/> for details.) + This attribute ensures that the <filename>bin</filename> subdirectories of these packages appear in the <envar>PATH</envar> environment variable during the build, that their <filename>include</filename> subdirectories are searched by the C compiler, and so on. (See <xref linkend="ssec-setup-hooks"/> for details.) </para> <para> - Often it is necessary to override or modify some aspect of the build. To - make this easier, the standard environment breaks the package build into a - number of <emphasis>phases</emphasis>, all of which can be overridden or - modified individually: unpacking the sources, applying patches, configuring, - building, and installing. (There are some others; see - <xref linkend="sec-stdenv-phases"/>.) For instance, a package that doesn’t - supply a makefile but instead has to be compiled “manually” could be - handled like this: + Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of <emphasis>phases</emphasis>, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see <xref linkend="sec-stdenv-phases"/>.) For instance, a package that doesn’t supply a makefile but instead has to be compiled “manually” could be handled like this: <programlisting> stdenv.mkDerivation { name = "fnord-4.5"; @@ -87,20 +55,15 @@ stdenv.mkDerivation { cp foo $out/bin ''; }</programlisting> - (Note the use of <literal>''</literal>-style string literals, which are very - convenient for large multi-line script fragments because they don’t need - escaping of <literal>"</literal> and <literal>\</literal>, and because - indentation is intelligently removed.) + (Note the use of <literal>''</literal>-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of <literal>"</literal> and <literal>\</literal>, and because indentation is intelligently removed.) </para> <para> - There are many other attributes to customise the build. These are listed in - <xref linkend="ssec-stdenv-attributes"/>. + There are many other attributes to customise the build. These are listed in <xref linkend="ssec-stdenv-attributes"/>. </para> <para> - While the standard environment provides a generic builder, you can still - supply your own build script: + While the standard environment provides a generic builder, you can still supply your own build script: <programlisting> stdenv.mkDerivation { name = "libfoo-1.2.3"; @@ -111,9 +74,7 @@ stdenv.mkDerivation { <programlisting> source $stdenv/setup </programlisting> - to let <literal>stdenv</literal> set up the environment (e.g., process the - <varname>buildInputs</varname>). If you want, you can still use - <literal>stdenv</literal>’s generic builder: + to let <literal>stdenv</literal> set up the environment (e.g., process the <varname>buildInputs</varname>). If you want, you can still use <literal>stdenv</literal>’s generic builder: <programlisting> source $stdenv/setup @@ -179,23 +140,17 @@ genericBuild </listitem> <listitem> <para> - <command>gzip</command>, <command>bzip2</command> and - <command>xz</command>. + <command>gzip</command>, <command>bzip2</command> and <command>xz</command>. </para> </listitem> <listitem> <para> - GNU Make. It has been patched to provide <quote>nested</quote> output - that can be fed into the <command>nix-log2xml</command> command and - <command>log2html</command> stylesheet to create a structured, readable - output of the build steps performed by Make. + GNU Make. It has been patched to provide <quote>nested</quote> output that can be fed into the <command>nix-log2xml</command> command and <command>log2html</command> stylesheet to create a structured, readable output of the build steps performed by Make. </para> </listitem> <listitem> <para> - Bash. This is the shell used for all builders in the Nix Packages - collection. Not using <command>/bin/sh</command> removes a large source - of portability problems. + Bash. This is the shell used for all builders in the Nix Packages collection. Not using <command>/bin/sh</command> removes a large source of portability problems. </para> </listitem> <listitem> @@ -207,108 +162,52 @@ genericBuild </para> <para> - On Linux, <literal>stdenv</literal> also includes the - <command>patchelf</command> utility. + On Linux, <literal>stdenv</literal> also includes the <command>patchelf</command> utility. </para> </section> <section xml:id="ssec-stdenv-dependencies"> <title>Specifying dependencies</title> <para> - As described in the Nix manual, almost any <filename>*.drv</filename> store - path in a derivation's attribute set will induce a dependency on that - derivation. <varname>mkDerivation</varname>, however, takes a few attributes - intended to, between them, include all the dependencies of a package. This - is done both for structure and consistency, but also so that certain other - setup can take place. For example, certain dependencies need their bin - directories added to the <envar>PATH</envar>. That is built-in, but other - setup is done via a pluggable mechanism that works in conjunction with these - dependency attributes. See <xref linkend="ssec-setup-hooks"/> for details. + As described in the Nix manual, almost any <filename>*.drv</filename> store path in a derivation's attribute set will induce a dependency on that derivation. <varname>mkDerivation</varname>, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the <envar>PATH</envar>. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See <xref linkend="ssec-setup-hooks"/> for details. </para> <para> - Dependencies can be broken down along three axes: their host and target - platforms relative to the new derivation's, and whether they are propagated. - The platform distinctions are motivated by cross compilation; see - <xref linkend="chap-cross"/> for exactly what each platform means. + Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. The platform distinctions are motivated by cross compilation; see <xref linkend="chap-cross"/> for exactly what each platform means. <footnote xml:id="footnote-stdenv-ignored-build-platform"> <para> - The build platform is ignored because it is a mere implementation detail - of the package satisfying the dependency: As a general programming - principle, dependencies are always <emphasis>specified</emphasis> as - interfaces, not concrete implementation. + The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always <emphasis>specified</emphasis> as interfaces, not concrete implementation. </para> </footnote> - But even if one is not cross compiling, the platforms imply whether or not - the dependency is needed at run-time or build-time, a concept that makes - perfect sense outside of cross compilation. By default, the - run-time/build-time distinction is just a hint for mental clarity, but with - <varname>strictDeps</varname> set it is mostly enforced even in the native - case. + But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with <varname>strictDeps</varname> set it is mostly enforced even in the native case. </para> <para> - The extension of <envar>PATH</envar> with dependencies, alluded to above, - proceeds according to the relative platforms alone. The process is carried - out only for dependencies whose host platform matches the new derivation's - build platform i.e. dependencies which run on the platform where the new - derivation will be built. + The extension of <envar>PATH</envar> with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation's build platform i.e. dependencies which run on the platform where the new derivation will be built. <footnote xml:id="footnote-stdenv-native-dependencies-in-path"> <para> - Currently, this means for native builds all dependencies are put on the - <envar>PATH</envar>. But in the future that may not be the case for sake - of matching cross: the platforms would be assumed to be unique for native - and cross builds alike, so only the <varname>depsBuild*</varname> and - <varname>nativeBuildInputs</varname> would be added to the - <envar>PATH</envar>. + Currently, this means for native builds all dependencies are put on the <envar>PATH</envar>. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the <varname>depsBuild*</varname> and <varname>nativeBuildInputs</varname> would be added to the <envar>PATH</envar>. </para> </footnote> - For each dependency <replaceable>dep</replaceable> of those dependencies, - <filename><replaceable>dep</replaceable>/bin</filename>, if present, is - added to the <envar>PATH</envar> environment variable. + For each dependency <replaceable>dep</replaceable> of those dependencies, <filename><replaceable>dep</replaceable>/bin</filename>, if present, is added to the <envar>PATH</envar> environment variable. </para> <para> - The dependency is propagated when it forces some of its other-transitive - (non-immediate) downstream dependencies to also take it on as an immediate - dependency. Nix itself already takes a package's transitive dependencies - into account, but this propagation ensures nixpkgs-specific infrastructure - like setup hooks (mentioned above) also are run as if the propagated - dependency. + The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. </para> <para> - It is important to note that dependencies are not necessarily propagated as - the same sort of dependency that they were before, but rather as the - corresponding sort so that the platform rules still line up. The exact rules - for dependency propagation can be given by assigning to each dependency two - integers based one how its host and target platforms are offset from the - depending derivation's platforms. Those offsets are given below in the - descriptions of each dependency list attribute. Algorithmically, we traverse - propagated inputs, accumulating every propagated dependency's propagated - dependencies and adjusting them to account for the "shift in perspective" - described by the current dependency's platform offsets. This results in sort - a transitive closure of the dependency relation, with the offsets being - approximately summed when two dependency links are combined. We also prune - transitive dependencies whose combined offsets go out-of-bounds, which can - be viewed as a filter over that transitive closure removing dependencies - that are blatantly absurd. + It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation's platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency's propagated dependencies and adjusting them to account for the "shift in perspective" described by the current dependency's platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. </para> <para> - We can define the process precisely with - <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural - Deduction</link> using the inference rules. This probably seems a bit - obtuse, but so is the bash code that actually implements it! + We can define the process precisely with <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural Deduction</link> using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it! <footnote xml:id="footnote-stdenv-find-inputs-location"> <para> - The <function>findInputs</function> function, currently residing in - <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the - propagation logic. + The <function>findInputs</function> function, currently residing in <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the propagation logic. </para> </footnote> - They're confusing in very different ways so... hopefully if something - doesn't make sense in one presentation, it will in the other! + They're confusing in very different ways so... hopefully if something doesn't make sense in one presentation, it will in the other! <programlisting> let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) @@ -335,50 +234,22 @@ propagated-dep(mapOffset(h0, t0, h1), propagated-dep(h, t, A, B) ----------------------------- Propagated dependencies count as dependencies dep(h, t, A, B)</programlisting> - Some explanation of this monstrosity is in order. In the common case, the - target offset of a dependency is the successor to the target offset: - <literal>t = h + 1</literal>. That means that: + Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: <literal>t = h + 1</literal>. That means that: <programlisting> let f(h, t, i) = i + (if i <= 0 then h else t - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h </programlisting> - This is where "sum-like" comes in from above: We can just sum all of the - host offsets to get the host offset of the transitive dependency. The target - offset is the transitive dependency is simply the host offset + 1, just as - it was with the dependencies composed to make this transitive one; it can be - ignored as it doesn't add any new information. + This is where "sum-like" comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn't add any new information. </para> <para> - Because of the bounds checks, the uncommon cases are <literal>h = - t</literal> and <literal>h + 2 = t</literal>. In the former case, the - motivation for <function>mapOffset</function> is that since its host and - target platforms are the same, no transitive dependency of it should be able - to "discover" an offset greater than its reduced target offsets. - <function>mapOffset</function> effectively "squashes" all its transitive - dependencies' offsets so that none will ever be greater than the target - offset of the original <literal>h = t</literal> package. In the other case, - <literal>h + 1</literal> is skipped over between the host and target - offsets. Instead of squashing the offsets, we need to "rip" them apart so no - transitive dependencies' offset is that one. + Because of the bounds checks, the uncommon cases are <literal>h = t</literal> and <literal>h + 2 = t</literal>. In the former case, the motivation for <function>mapOffset</function> is that since its host and target platforms are the same, no transitive dependency of it should be able to "discover" an offset greater than its reduced target offsets. <function>mapOffset</function> effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original <literal>h = t</literal> package. In the other case, <literal>h + 1</literal> is skipped over between the host and target offsets. Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. </para> <para> - Overall, the unifying theme here is that propagation shouldn't be - introducing transitive dependencies involving platforms the depending - package is unaware of. [One can imagine the dependending package asking for - dependencies with the platforms it knows about; other platforms it doesn't - know how to ask for. The platform description in that scenario is a kind of - unforagable capability.] The offset bounds checking and definition of - <function>mapOffset</function> together ensure that this is the case. - Discovering a new offset is discovering a new platform, and since those - platforms weren't in the derivation "spec" of the needing package, they - cannot be relevant. From a capability perspective, we can imagine that the - host and target platforms of a package are the capabilities a package - requires, and the depending package must provide the capability to the - dependency. + Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the depending package is unaware of. [One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn't know how to ask for. The platform description in that scenario is a kind of unforagable capability.] The offset bounds checking and definition of <function>mapOffset</function> together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. </para> <variablelist> @@ -389,23 +260,10 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host and target platforms are the new - derivation's build platform. This means a <literal>-1</literal> host and - <literal>-1</literal> target offset from the new derivation's platforms. - These are programs and libraries used at build time that produce programs - and libraries also used at build time. If the dependency doesn't care - about the target platform (i.e. isn't a compiler or similar tool), put it - in <varname>nativeBuildInputs</varname> instead. The most common use of - this <literal>buildPackages.stdenv.cc</literal>, the default C compiler - for this role. That example crops up more than one might think in old - commonly used C libraries. + A list of dependencies whose host and target platforms are the new derivation's build platform. This means a <literal>-1</literal> host and <literal>-1</literal> target offset from the new derivation's platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in <varname>nativeBuildInputs</varname> instead. The most common use of this <literal>buildPackages.stdenv.cc</literal>, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. </para> <para> - Since these packages are able to be run at build-time, they are always - added to the <envar>PATH</envar>, as described above. But since these - packages are only guaranteed to be able to run then, they shouldn't - persist as run-time dependencies. This isn't currently enforced, but - could be in the future. + Since these packages are able to be run at build-time, they are always added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. </para> </listitem> </varlistentry> @@ -415,24 +273,10 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host platform is the new derivation's build - platform, and target platform is the new derivation's host platform. This - means a <literal>-1</literal> host offset and <literal>0</literal> target - offset from the new derivation's platforms. These are programs and - libraries used at build-time that, if they are a compiler or similar - tool, produce code to run at run-time—i.e. tools used to build the new - derivation. If the dependency doesn't care about the target platform - (i.e. isn't a compiler or similar tool), put it here, rather than in - <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>. - This could be called <varname>depsBuildHost</varname> but - <varname>nativeBuildInputs</varname> is used for historical continuity. - </para> - <para> - Since these packages are able to be run at build-time, they are added to - the <envar>PATH</envar>, as described above. But since these packages are - only guaranteed to be able to run then, they shouldn't persist as - run-time dependencies. This isn't currently enforced, but could be in the - future. + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. This means a <literal>-1</literal> host offset and <literal>0</literal> target offset from the new derivation's platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>. This could be called <varname>depsBuildHost</varname> but <varname>nativeBuildInputs</varname> is used for historical continuity. + </para> + <para> + Since these packages are able to be run at build-time, they are added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. </para> </listitem> </varlistentry> @@ -442,39 +286,13 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host platform is the new derivation's build - platform, and target platform is the new derivation's target platform. - This means a <literal>-1</literal> host offset and <literal>1</literal> - target offset from the new derivation's platforms. These are programs - used at build time that produce code to run with code produced by the - depending package. Most commonly, these are tools used to build the - runtime or standard library that the currently-being-built compiler will - inject into any code it compiles. In many cases, the - currently-being-built-compiler is itself employed for that task, but when - that compiler won't run (i.e. its build and host platform differ) this is - not possible. Other times, the compiler relies on some other tool, like - binutils, that is always built separately so that the dependency is - unconditional. - </para> - <para> - This is a somewhat confusing concept to wrap one’s head around, and for - good reason. As the only dependency type where the platform offsets are - not adjacent integers, it requires thinking of a bootstrapping stage - <emphasis>two</emphasis> away from the current one. It and its use-case - go hand in hand and are both considered poor form: try to not need this - sort of dependency, and try to avoid building standard libraries and - runtimes in the same derivation as the compiler produces code using them. - Instead strive to build those like a normal library, using the - newly-built compiler just as a normal library would. In short, do not use - this attribute unless you are packaging a compiler and are sure it is - needed. - </para> - <para> - Since these packages are able to run at build time, they are added to the - <envar>PATH</envar>, as described above. But since these packages are - only guaranteed to be able to run then, they shouldn't persist as - run-time dependencies. This isn't currently enforced, but could be in the - future. + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. This means a <literal>-1</literal> host offset and <literal>1</literal> target offset from the new derivation's platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional. + </para> + <para> + This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage <emphasis>two</emphasis> away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + </para> + <para> + Since these packages are able to run at build time, they are added to the <envar>PATH</envar>, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. </para> </listitem> </varlistentry> @@ -484,16 +302,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host and target platforms match the new - derivation's host platform. This means a <literal>0</literal> host offset - and <literal>0</literal> target offset from the new derivation's host - platform. These are packages used at run-time to generate code also used - at run-time. In practice, this would usually be tools used by compilers - for macros or a metaprogramming system, or libraries used by the macros - or metaprogramming code itself. It's always preferable to use a - <varname>depsBuildBuild</varname> dependency in the derivation being - built over a <varname>depsHostHost</varname> on the tool doing the - building for this purpose. + A list of dependencies whose host and target platforms match the new derivation's host platform. This means a <literal>0</literal> host offset and <literal>0</literal> target offset from the new derivation's host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It's always preferable to use a <varname>depsBuildBuild</varname> dependency in the derivation being built over a <varname>depsHostHost</varname> on the tool doing the building for this purpose. </para> </listitem> </varlistentry> @@ -503,21 +312,10 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host platform and target platform match the - new derivation's. This means a <literal>0</literal> host offset and a - <literal>1</literal> target offset from the new derivation's host - platform. This would be called <varname>depsHostTarget</varname> but for - historical continuity. If the dependency doesn't care about the target - platform (i.e. isn't a compiler or similar tool), put it here, rather - than in <varname>depsBuildBuild</varname>. + A list of dependencies whose host platform and target platform match the new derivation's. This means a <literal>0</literal> host offset and a <literal>1</literal> target offset from the new derivation's host platform. This would be called <varname>depsHostTarget</varname> but for historical continuity. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname>. </para> <para> - These are often programs and libraries used by the new derivation at - <emphasis>run</emphasis>-time, but that isn't always the case. For - example, the machine code in a statically-linked library is only used at - run-time, but the derivation containing the library is only needed at - build-time. Even in the dynamic case, the library may also be needed at - build-time to appease the linker. + These are often programs and libraries used by the new derivation at <emphasis>run</emphasis>-time, but that isn't always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker. </para> </listitem> </varlistentry> @@ -527,14 +325,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A list of dependencies whose host platform matches the new derivation's - target platform. This means a <literal>1</literal> offset from the new - derivation's platforms. These are packages that run on the target - platform, e.g. the standard library or run-time deps of standard library - that a compiler insists on knowing about. It's poor form in almost all - cases for a package to depend on another from a future stage [future - stage corresponding to positive offset]. Do not use this attribute unless - you are packaging a compiler and are sure it is needed. + A list of dependencies whose host platform matches the new derivation's target platform. This means a <literal>1</literal> offset from the new derivation's platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. Do not use this attribute unless you are packaging a compiler and are sure it is needed. </para> </listitem> </varlistentry> @@ -544,9 +335,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - The propagated equivalent of <varname>depsBuildBuild</varname>. This - perhaps never ought to be used, but it is included for consistency [see - below for the others]. + The propagated equivalent of <varname>depsBuildBuild</varname>. This perhaps never ought to be used, but it is included for consistency [see below for the others]. </para> </listitem> </varlistentry> @@ -556,18 +345,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - The propagated equivalent of <varname>nativeBuildInputs</varname>. This - would be called <varname>depsBuildHostPropagated</varname> but for - historical continuity. For example, if package <varname>Y</varname> has - <literal>propagatedNativeBuildInputs = [X]</literal>, and package - <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then - package <varname>Z</varname> will be built as if it included package - <varname>X</varname> in its <varname>nativeBuildInputs</varname>. If - instead, package <varname>Z</varname> has <literal>nativeBuildInputs = - [Y]</literal>, then <varname>Z</varname> will be built as if it included - <varname>X</varname> in the <varname>depsBuildBuild</varname> of package - <varname>Z</varname>, because of the sum of the two <literal>-1</literal> - host offsets. + The propagated equivalent of <varname>nativeBuildInputs</varname>. This would be called <varname>depsBuildHostPropagated</varname> but for historical continuity. For example, if package <varname>Y</varname> has <literal>propagatedNativeBuildInputs = [X]</literal>, and package <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then package <varname>Z</varname> will be built as if it included package <varname>X</varname> in its <varname>nativeBuildInputs</varname>. If instead, package <varname>Z</varname> has <literal>nativeBuildInputs = [Y]</literal>, then <varname>Z</varname> will be built as if it included <varname>X</varname> in the <varname>depsBuildBuild</varname> of package <varname>Z</varname>, because of the sum of the two <literal>-1</literal> host offsets. </para> </listitem> </varlistentry> @@ -577,8 +355,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - The propagated equivalent of <varname>depsBuildTarget</varname>. This is - prefixed for the same reason of alerting potential users. + The propagated equivalent of <varname>depsBuildTarget</varname>. This is prefixed for the same reason of alerting potential users. </para> </listitem> </varlistentry> @@ -598,9 +375,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - The propagated equivalent of <varname>buildInputs</varname>. This would - be called <varname>depsHostTargetPropagated</varname> but for historical - continuity. + The propagated equivalent of <varname>buildInputs</varname>. This would be called <varname>depsHostTargetPropagated</varname> but for historical continuity. </para> </listitem> </varlistentry> @@ -610,8 +385,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - The propagated equivalent of <varname>depsTargetTarget</varname>. This is - prefixed for the same reason of alerting potential users. + The propagated equivalent of <varname>depsTargetTarget</varname>. This is prefixed for the same reason of alerting potential users. </para> </listitem> </varlistentry> @@ -628,15 +402,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - A natural number indicating how much information to log. If set to 1 or - higher, <literal>stdenv</literal> will print moderate debugging - information during the build. In particular, the <command>gcc</command> - and <command>ld</command> wrapper scripts will print out the complete - command line passed to the wrapped tools. If set to 6 or higher, the - <literal>stdenv</literal> setup script will be run with <literal>set - -x</literal> tracing. If set to 7 or higher, the <command>gcc</command> - and <command>ld</command> wrapper scripts will also be run with - <literal>set -x</literal> tracing. + A natural number indicating how much information to log. If set to 1 or higher, <literal>stdenv</literal> will print moderate debugging information during the build. In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing. If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing. </para> </listitem> </varlistentry> @@ -650,15 +416,10 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - If set to <literal>true</literal>, <literal>stdenv</literal> will pass - specific flags to <literal>make</literal> and other build tools to enable - parallel building with up to <literal>build-cores</literal> workers. + If set to <literal>true</literal>, <literal>stdenv</literal> will pass specific flags to <literal>make</literal> and other build tools to enable parallel building with up to <literal>build-cores</literal> workers. </para> <para> - Unless set to <literal>false</literal>, some build systems with good - support for parallel building including <literal>cmake</literal>, - <literal>meson</literal>, and <literal>qmake</literal> will set it to - <literal>true</literal>. + Unless set to <literal>false</literal>, some build systems with good support for parallel building including <literal>cmake</literal>, <literal>meson</literal>, and <literal>qmake</literal> will set it to <literal>true</literal>. </para> </listitem> </varlistentry> @@ -672,8 +433,7 @@ let f(h, h + 1, i) = i + h </term> <listitem> <para> - This is an attribute set which can be filled with arbitrary values. For - example: + This is an attribute set which can be filled with arbitrary values. For example: <programlisting> passthru = { foo = "bar"; @@ -685,17 +445,7 @@ passthru = { </programlisting> </para> <para> - Values inside it are not passed to the builder, so you can change them - without triggering a rebuild. However, they can be accessed outside of a - derivation directly, as if they were set inside a derivation itself, e.g. - <literal>hello.baz.value1</literal>. We don't specify any usage or schema - of <literal>passthru</literal> - it is meant for values that would be - useful outside the derivation in other parts of a Nix expression (e.g. in - other derivations). An example would be to convey some specific - dependency of your derivation which contains a program with plugins - support. Later, others who make derivations with plugins can use - passed-through dependency to ensure that their plugin would be - binary-compatible with built program. + Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. <literal>hello.baz.value1</literal>. We don't specify any usage or schema of <literal>passthru</literal> - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program. </para> </listitem> </varlistentry> @@ -705,9 +455,7 @@ passthru = { </term> <listitem> <para> - A script to be run by <filename>maintainers/scripts/update.nix</filename> - when the package is matched. It needs to be an executable file, either on - the file system: + A script to be run by <filename>maintainers/scripts/update.nix</filename> when the package is matched. It needs to be an executable file, either on the file system: <programlisting> passthru.updateScript = ./update.sh; </programlisting> @@ -723,21 +471,16 @@ passthru.updateScript = writeScript "update-zoom-us" '' update-source-version zoom-us "$version" ''; </programlisting> - The attribute can also contain a list, a script followed by arguments to - be passed to it: + The attribute can also contain a list, a script followed by arguments to be passed to it: <programlisting> passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; </programlisting> </para> <para> - The script will be usually run from the root of the Nixpkgs repository - but you should not rely on that. Also note that the update scripts will - be run in parallel by default; you should avoid running <command>git - commit</command> or any other commands that cannot handle that. + The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that. </para> <para> - For information about how to run the updates, execute <command>nix-shell - maintainers/scripts/update.nix</command>. + For information about how to run the updates, execute <command>nix-shell maintainers/scripts/update.nix</command>. </para> </listitem> </varlistentry> @@ -747,33 +490,18 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <title>Phases</title> <para> - The generic builder has a number of <emphasis>phases</emphasis>. Package - builds are split into phases to make it easier to override specific parts of - the build (e.g., unpacking the sources or installing the binaries). - Furthermore, it allows a nicer presentation of build logs in the Nix build - farm. + The generic builder has a number of <emphasis>phases</emphasis>. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. </para> <para> - Each phase can be overridden in its entirety either by setting the - environment variable <varname><replaceable>name</replaceable>Phase</varname> - to a string containing some shell commands to be executed, or by redefining - the shell function <varname><replaceable>name</replaceable>Phase</varname>. - The former is convenient to override a phase from the derivation, while the - latter is convenient from a build script. However, typically one only wants - to <emphasis>add</emphasis> some commands to a phase, e.g. by defining - <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping - some of the default actions may have unexpected consequences. The default - script for each phase is defined in the file - <filename>pkgs/stdenv/generic/setup.sh</filename>. + Each phase can be overridden in its entirety either by setting the environment variable <varname><replaceable>name</replaceable>Phase</varname> to a string containing some shell commands to be executed, or by redefining the shell function <varname><replaceable>name</replaceable>Phase</varname>. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to <emphasis>add</emphasis> some commands to a phase, e.g. by defining <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file <filename>pkgs/stdenv/generic/setup.sh</filename>. </para> <section xml:id="ssec-controlling-phases"> <title>Controlling phases</title> <para> - There are a number of variables that control what phases are executed and - in what order: + There are a number of variables that control what phases are executed and in what order: <variablelist> <title>Variables affecting phase control</title> <varlistentry> @@ -782,19 +510,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - Specifies the phases. You can change the order in which phases are - executed, or add new phases, by setting this variable. If it’s not - set, the default value is used, which is <literal>$prePhases - unpackPhase patchPhase $preConfigurePhases configurePhase - $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase - fixupPhase installCheckPhase $preDistPhases distPhase - $postPhases</literal>. + Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is <literal>$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases</literal>. </para> <para> - Usually, if you just want to add a few phases, it’s more convenient - to set one of the variables below (such as - <varname>preInstallPhases</varname>), as you then don’t specify all - the normal phases. + Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as <varname>preInstallPhases</varname>), as you then don’t specify all the normal phases. </para> </listitem> </varlistentry> @@ -876,11 +595,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <title>The unpack phase</title> <para> - The unpack phase is responsible for unpacking the source code of the - package. The default implementation of <function>unpackPhase</function> - unpacks the source files listed in the <envar>src</envar> environment - variable to the current directory. It supports the following files by - default: + The unpack phase is responsible for unpacking the source code of the package. The default implementation of <function>unpackPhase</function> unpacks the source files listed in the <envar>src</envar> environment variable to the current directory. It supports the following files by default: <variablelist> <varlistentry> <term> @@ -888,13 +603,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - These can optionally be compressed using <command>gzip</command> - (<filename>.tar.gz</filename>, <filename>.tgz</filename> or - <filename>.tar.Z</filename>), <command>bzip2</command> - (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or - <filename>.tbz</filename>) or <command>xz</command> - (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or - <filename>.txz</filename>). + These can optionally be compressed using <command>gzip</command> (<filename>.tar.gz</filename>, <filename>.tgz</filename> or <filename>.tar.Z</filename>), <command>bzip2</command> (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or <filename>.tbz</filename>) or <command>xz</command> (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or <filename>.txz</filename>). </para> </listitem> </varlistentry> @@ -904,9 +613,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - Zip files are unpacked using <command>unzip</command>. However, - <command>unzip</command> is not in the standard environment, so you - should add it to <varname>nativeBuildInputs</varname> yourself. + Zip files are unpacked using <command>unzip</command>. However, <command>unzip</command> is not in the standard environment, so you should add it to <varname>nativeBuildInputs</varname> yourself. </para> </listitem> </varlistentry> @@ -916,16 +623,12 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - These are simply copied to the current directory. The hash part of the - file name is stripped, e.g. - <filename>/nix/store/1wydxgby13cz...-my-sources</filename> would be - copied to <filename>my-sources</filename>. + These are simply copied to the current directory. The hash part of the file name is stripped, e.g. <filename>/nix/store/1wydxgby13cz...-my-sources</filename> would be copied to <filename>my-sources</filename>. </para> </listitem> </varlistentry> </variablelist> - Additional file types can be supported by setting the - <varname>unpackCmd</varname> variable (see below). + Additional file types can be supported by setting the <varname>unpackCmd</varname> variable (see below). </para> <para></para> @@ -938,8 +641,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The list of source files or directories to be unpacked or copied. One of - these must be set. + The list of source files or directories to be unpacked or copied. One of these must be set. </para> </listitem> </varlistentry> @@ -949,10 +651,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - After running <function>unpackPhase</function>, the generic builder - changes the current directory to the directory created by unpacking the - sources. If there are multiple source directories, you should set - <varname>sourceRoot</varname> to the name of the intended directory. + After running <function>unpackPhase</function>, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set <varname>sourceRoot</varname> to the name of the intended directory. </para> </listitem> </varlistentry> @@ -962,10 +661,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - Alternatively to setting <varname>sourceRoot</varname>, you can set - <varname>setSourceRoot</varname> to a shell command to be evaluated by - the unpack phase after the sources have been unpacked. This command must - set <varname>sourceRoot</varname>. + Alternatively to setting <varname>sourceRoot</varname>, you can set <varname>setSourceRoot</varname> to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set <varname>sourceRoot</varname>. </para> </listitem> </varlistentry> @@ -1005,10 +701,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - If set to <literal>1</literal>, the unpacked sources are - <emphasis>not</emphasis> made writable. By default, they are made - writable to prevent problems with read-only sources. For example, copied - store directories would be read-only without this. + If set to <literal>1</literal>, the unpacked sources are <emphasis>not</emphasis> made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this. </para> </listitem> </varlistentry> @@ -1018,9 +711,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The unpack phase evaluates the string <literal>$unpackCmd</literal> for - any unrecognised file. The path to the current source file is contained - in the <varname>curSrc</varname> variable. + The unpack phase evaluates the string <literal>$unpackCmd</literal> for any unrecognised file. The path to the current source file is contained in the <varname>curSrc</varname> variable. </para> </listitem> </varlistentry> @@ -1031,8 +722,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <title>The patch phase</title> <para> - The patch phase applies the list of patches defined in the - <varname>patches</varname> variable. + The patch phase applies the list of patches defined in the <varname>patches</varname> variable. </para> <variablelist> @@ -1043,11 +733,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The list of patches. They must be in the format accepted by the - <command>patch</command> command, and may optionally be compressed using - <command>gzip</command> (<filename>.gz</filename>), - <command>bzip2</command> (<filename>.bz2</filename>) or - <command>xz</command> (<filename>.xz</filename>). + The list of patches. They must be in the format accepted by the <command>patch</command> command, and may optionally be compressed using <command>gzip</command> (<filename>.gz</filename>), <command>bzip2</command> (<filename>.bz2</filename>) or <command>xz</command> (<filename>.xz</filename>). </para> </listitem> </varlistentry> @@ -1057,9 +743,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - Flags to be passed to <command>patch</command>. If not set, the argument - <option>-p1</option> is used, which causes the leading directory - component to be stripped from the file names in each patch. + Flags to be passed to <command>patch</command>. If not set, the argument <option>-p1</option> is used, which causes the leading directory component to be stripped from the file names in each patch. </para> </listitem> </varlistentry> @@ -1090,9 +774,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <title>The configure phase</title> <para> - The configure phase prepares the source tree for building. The default - <function>configurePhase</function> runs <filename>./configure</filename> - (typically an Autoconf-generated script) if it exists. + The configure phase prepares the source tree for building. The default <function>configurePhase</function> runs <filename>./configure</filename> (typically an Autoconf-generated script) if it exists. </para> <variablelist> @@ -1103,10 +785,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The name of the configure script. It defaults to - <filename>./configure</filename> if it exists; otherwise, the configure - phase is skipped. This can actually be a command (like <literal>perl - ./Configure.pl</literal>). + The name of the configure script. It defaults to <filename>./configure</filename> if it exists; otherwise, the configure phase is skipped. This can actually be a command (like <literal>perl ./Configure.pl</literal>). </para> </listitem> </varlistentry> @@ -1116,8 +795,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - A list of strings passed as additional arguments to the configure - script. + A list of strings passed as additional arguments to the configure script. </para> </listitem> </varlistentry> @@ -1137,9 +815,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - A shell array containing additional arguments passed to the configure - script. You must use this instead of <varname>configureFlags</varname> - if the arguments contain spaces. + A shell array containing additional arguments passed to the configure script. You must use this instead of <varname>configureFlags</varname> if the arguments contain spaces. </para> </listitem> </varlistentry> @@ -1149,8 +825,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - By default, the flag <literal>--prefix=$prefix</literal> is added to the - configure flags. If this is undesirable, set this variable to true. + By default, the flag <literal>--prefix=$prefix</literal> is added to the configure flags. If this is undesirable, set this variable to true. </para> </listitem> </varlistentry> @@ -1160,9 +835,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The prefix under which the package must be installed, passed via the - <option>--prefix</option> option to the configure script. It defaults to - <option>$out</option>. + The prefix under which the package must be installed, passed via the <option>--prefix</option> option to the configure script. It defaults to <option>$out</option>. </para> </listitem> </varlistentry> @@ -1172,8 +845,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - The key to use when specifying the prefix. By default, this is set to - <option>--prefix=</option> as that is used by the majority of packages. + The key to use when specifying the prefix. By default, this is set to <option>--prefix=</option> as that is used by the majority of packages. </para> </listitem> </varlistentry> @@ -1183,9 +855,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - By default, the flag <literal>--disable-dependency-tracking</literal> is - added to the configure flags to speed up Automake-based builds. If this - is undesirable, set this variable to true. + By default, the flag <literal>--disable-dependency-tracking</literal> is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true. </para> </listitem> </varlistentry> @@ -1195,15 +865,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - By default, the configure phase applies some special hackery to all - files called <filename>ltmain.sh</filename> before running the configure - script in order to improve the purity of Libtool-based packages + By default, the configure phase applies some special hackery to all files called <filename>ltmain.sh</filename> before running the configure script in order to improve the purity of Libtool-based packages <footnote xml:id="footnote-stdenv-sys-lib-search-path"> <para> - It clears the - <varname>sys_lib_<replaceable>*</replaceable>search_path</varname> - variables in the Libtool script to prevent Libtool from using - libraries in <filename>/usr/lib</filename> and such. + It clears the <varname>sys_lib_<replaceable>*</replaceable>search_path</varname> variables in the Libtool script to prevent Libtool from using libraries in <filename>/usr/lib</filename> and such. </para> </footnote> . If this is undesirable, set this variable to true. @@ -1216,9 +881,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - By default, when the configure script has - <option>--enable-static</option>, the option - <option>--disable-static</option> is added to the configure flags. + By default, when the configure script has <option>--enable-static</option>, the option <option>--disable-static</option> is added to the configure flags. </para> <para> If this is undesirable, set this variable to true. @@ -1231,16 +894,10 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - By default, when cross compiling, the configure script has - <option>--build=...</option> and <option>--host=...</option> passed. - Packages can instead pass <literal>[ "build" "host" "target" ]</literal> - or a subset to control exactly which platform flags are passed. - Compilers and other tools can use this to also pass the target platform. + By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed. Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform. <footnote xml:id="footnote-stdenv-build-time-guessing-impurity"> <para> - Eventually these will be passed building natively as well, to improve - determinism: build-time guessing, as is done today, is a risk of - impurity. + Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity. </para> </footnote> </para> @@ -1273,12 +930,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] <title>The build phase</title> <para> - The build phase is responsible for actually building the package (e.g. - compiling it). The default <function>buildPhase</function> simply calls - <command>make</command> if a file named <filename>Makefile</filename>, - <filename>makefile</filename> or <filename>GNUmakefile</filename> exists in - the current directory (or the <varname>makefile</varname> is explicitly - set); otherwise it does nothing. + The build phase is responsible for actually building the package (e.g. compiling it). The default <function>buildPhase</function> simply calls <command>make</command> if a file named <filename>Makefile</filename>, <filename>makefile</filename> or <filename>GNUmakefile</filename> exists in the current directory (or the <varname>makefile</varname> is explicitly set); otherwise it does nothing. </para> <variablelist> @@ -1309,17 +961,13 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] </term> <listitem> <para> - A list of strings passed as additional flags to <command>make</command>. - These flags are also used by the default install and check phase. For - setting make flags specific to the build phase, use - <varname>buildFlags</varname> (see below). + A list of strings passed as additional flags to <command>make</command>. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use <varname>buildFlags</varname> (see below). <programlisting> makeFlags = [ "PREFIX=$(out)" ]; </programlisting> <note> <para> - The flags are quoted in bash, but environment variables can be - specified by using the make syntax. + The flags are quoted in bash, but environment variables can be specified by using the make syntax. </para> </note> </para> @@ -1331,18 +979,13 @@ makeFlags = [ "PREFIX=$(out)" ]; </term> <listitem> <para> - A shell array containing additional arguments passed to - <command>make</command>. You must use this instead of - <varname>makeFlags</varname> if the arguments contain spaces, e.g. + A shell array containing additional arguments passed to <command>make</command>. You must use this instead of <varname>makeFlags</varname> if the arguments contain spaces, e.g. <programlisting> preBuild = '' makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") ''; </programlisting> - Note that shell arrays cannot be passed through environment variables, - so you cannot set <varname>makeFlagsArray</varname> in a derivation - attribute (because those are passed through environment variables): you - have to define them in shell code. + Note that shell arrays cannot be passed through environment variables, so you cannot set <varname>makeFlagsArray</varname> in a derivation attribute (because those are passed through environment variables): you have to define them in shell code. </para> </listitem> </varlistentry> @@ -1352,9 +995,7 @@ preBuild = '' </term> <listitem> <para> - A list of strings passed as additional flags to <command>make</command>. - Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, - but only used by the build phase. + A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the build phase. </para> </listitem> </varlistentry> @@ -1381,14 +1022,11 @@ preBuild = '' </variablelist> <para> - You can set flags for <command>make</command> through the - <varname>makeFlags</varname> variable. + You can set flags for <command>make</command> through the <varname>makeFlags</varname> variable. </para> <para> - Before and after running <command>make</command>, the hooks - <varname>preBuild</varname> and <varname>postBuild</varname> are called, - respectively. + Before and after running <command>make</command>, the hooks <varname>preBuild</varname> and <varname>postBuild</varname> are called, respectively. </para> </section> @@ -1396,10 +1034,7 @@ preBuild = '' <title>The check phase</title> <para> - The check phase checks whether the package was built correctly by running - its test suite. The default <function>checkPhase</function> calls - <command>make check</command>, but only if the <varname>doCheck</varname> - variable is enabled. + The check phase checks whether the package was built correctly by running its test suite. The default <function>checkPhase</function> calls <command>make check</command>, but only if the <varname>doCheck</varname> variable is enabled. </para> <variablelist> @@ -1410,14 +1045,9 @@ preBuild = '' </term> <listitem> <para> - Controls whether the check phase is executed. By default it is skipped, - but if <varname>doCheck</varname> is set to true, the check phase is - usually executed. Thus you should set + Controls whether the check phase is executed. By default it is skipped, but if <varname>doCheck</varname> is set to true, the check phase is usually executed. Thus you should set <programlisting>doCheck = true;</programlisting> - in the derivation to enable checks. The exception is cross compilation. - Cross compiled builds never run tests, no matter how - <varname>doCheck</varname> is set, as the newly-built program won't run - on the platform used to build it. + in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how <varname>doCheck</varname> is set, as the newly-built program won't run on the platform used to build it. </para> </listitem> </varlistentry> @@ -1437,8 +1067,7 @@ preBuild = '' </term> <listitem> <para> - The make target that runs the tests. Defaults to - <literal>check</literal>. + The make target that runs the tests. Defaults to <literal>check</literal>. </para> </listitem> </varlistentry> @@ -1448,9 +1077,7 @@ preBuild = '' </term> <listitem> <para> - A list of strings passed as additional flags to <command>make</command>. - Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, - but only used by the check phase. + A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the check phase. </para> </listitem> </varlistentry> @@ -1460,9 +1087,7 @@ preBuild = '' </term> <listitem> <para> - A list of dependencies used by the phase. This gets included in - <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is - set. + A list of dependencies used by the phase. This gets included in <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is set. </para> </listitem> </varlistentry> @@ -1493,10 +1118,7 @@ preBuild = '' <title>The install phase</title> <para> - The install phase is responsible for installing the package in the Nix - store under <envar>out</envar>. The default - <function>installPhase</function> creates the directory - <literal>$out</literal> and calls <command>make install</command>. + The install phase is responsible for installing the package in the Nix store under <envar>out</envar>. The default <function>installPhase</function> creates the directory <literal>$out</literal> and calls <command>make install</command>. </para> <variablelist> @@ -1517,8 +1139,7 @@ preBuild = '' </term> <listitem> <para> - The make targets that perform the installation. Defaults to - <literal>install</literal>. Example: + The make targets that perform the installation. Defaults to <literal>install</literal>. Example: <programlisting> installTargets = "install-bin install-doc";</programlisting> </para> @@ -1530,9 +1151,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - A list of strings passed as additional flags to <command>make</command>. - Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, - but only used by the install phase. + A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the install phase. </para> </listitem> </varlistentry> @@ -1563,15 +1182,11 @@ installTargets = "install-bin install-doc";</programlisting> <title>The fixup phase</title> <para> - The fixup phase performs some (Nix-specific) post-processing actions on the - files installed under <filename>$out</filename> by the install phase. The - default <function>fixupPhase</function> does the following: + The fixup phase performs some (Nix-specific) post-processing actions on the files installed under <filename>$out</filename> by the install phase. The default <function>fixupPhase</function> does the following: <itemizedlist> <listitem> <para> - It moves the <filename>man/</filename>, <filename>doc/</filename> and - <filename>info/</filename> subdirectories of <envar>$out</envar> to - <filename>share/</filename>. + It moves the <filename>man/</filename>, <filename>doc/</filename> and <filename>info/</filename> subdirectories of <envar>$out</envar> to <filename>share/</filename>. </para> </listitem> <listitem> @@ -1581,19 +1196,12 @@ installTargets = "install-bin install-doc";</programlisting> </listitem> <listitem> <para> - On Linux, it applies the <command>patchelf</command> command to ELF - executables and libraries to remove unused directories from the - <literal>RPATH</literal> in order to prevent unnecessary runtime - dependencies. + On Linux, it applies the <command>patchelf</command> command to ELF executables and libraries to remove unused directories from the <literal>RPATH</literal> in order to prevent unnecessary runtime dependencies. </para> </listitem> <listitem> <para> - It rewrites the interpreter paths of shell scripts to paths found in - <envar>PATH</envar>. E.g., <filename>/usr/bin/perl</filename> will be - rewritten to - <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename> - found in <envar>PATH</envar>. + It rewrites the interpreter paths of shell scripts to paths found in <envar>PATH</envar>. E.g., <filename>/usr/bin/perl</filename> will be rewritten to <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename> found in <envar>PATH</envar>. </para> </listitem> </itemizedlist> @@ -1617,8 +1225,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set, libraries and executables are not stripped. By default, they - are. + If set, libraries and executables are not stripped. By default, they are. </para> </listitem> </varlistentry> @@ -1628,10 +1235,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - Like <varname>dontStrip</varname>, but only affects the - <command>strip</command> command targetting the package's host platform. - Useful when supporting cross compilation, but otherwise feel free to - ignore. + Like <varname>dontStrip</varname>, but only affects the <command>strip</command> command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. </para> </listitem> </varlistentry> @@ -1641,10 +1245,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - Like <varname>dontStrip</varname>, but only affects the - <command>strip</command> command targetting the packages' target - platform. Useful when supporting cross compilation, but otherwise feel - free to ignore. + Like <varname>dontStrip</varname>, but only affects the <command>strip</command> command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. </para> </listitem> </varlistentry> @@ -1654,8 +1255,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set, files in <filename>$out/sbin</filename> are not moved to - <filename>$out/bin</filename>. By default, they are. + If set, files in <filename>$out/sbin</filename> are not moved to <filename>$out/bin</filename>. By default, they are. </para> </listitem> </varlistentry> @@ -1665,10 +1265,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - List of directories to search for libraries and executables from which - <emphasis>all</emphasis> symbols should be stripped. By default, it’s - empty. Stripping all symbols is risky, since it may remove not just - debug symbols but also ELF information necessary for normal execution. + List of directories to search for libraries and executables from which <emphasis>all</emphasis> symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution. </para> </listitem> </varlistentry> @@ -1678,9 +1275,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - Flags passed to the <command>strip</command> command applied to the - files in the directories listed in <varname>stripAllList</varname>. - Defaults to <option>-s</option> (i.e. <option>--strip-all</option>). + Flags passed to the <command>strip</command> command applied to the files in the directories listed in <varname>stripAllList</varname>. Defaults to <option>-s</option> (i.e. <option>--strip-all</option>). </para> </listitem> </varlistentry> @@ -1690,9 +1285,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - List of directories to search for libraries and executables from which - only debugging-related symbols should be stripped. It defaults to - <literal>lib bin sbin</literal>. + List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>. </para> </listitem> </varlistentry> @@ -1702,9 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - Flags passed to the <command>strip</command> command applied to the - files in the directories listed in <varname>stripDebugList</varname>. - Defaults to <option>-S</option> (i.e. <option>--strip-debug</option>). + Flags passed to the <command>strip</command> command applied to the files in the directories listed in <varname>stripDebugList</varname>. Defaults to <option>-S</option> (i.e. <option>--strip-debug</option>). </para> </listitem> </varlistentry> @@ -1714,8 +1305,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set, the <command>patchelf</command> command is not used to remove - unnecessary <literal>RPATH</literal> entries. Only applies to Linux. + If set, the <command>patchelf</command> command is not used to remove unnecessary <literal>RPATH</literal> entries. Only applies to Linux. </para> </listitem> </varlistentry> @@ -1725,8 +1315,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set, scripts starting with <literal>#!</literal> do not have their - interpreter paths rewritten to paths in the Nix store. + If set, scripts starting with <literal>#!</literal> do not have their interpreter paths rewritten to paths in the Nix store. </para> </listitem> </varlistentry> @@ -1736,9 +1325,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set, libtool <literal>.la</literal> files associated with shared - libraries won't have their <literal>dependency_libs</literal> field - cleared. + If set, libtool <literal>.la</literal> files associated with shared libraries won't have their <literal>dependency_libs</literal> field cleared. </para> </listitem> </varlistentry> @@ -1748,9 +1335,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - The list of directories that must be moved from - <filename>$out</filename> to <filename>$out/share</filename>. Defaults - to <literal>man doc info</literal>. + The list of directories that must be moved from <filename>$out</filename> to <filename>$out/share</filename>. Defaults to <literal>man doc info</literal>. </para> </listitem> </varlistentry> @@ -1760,11 +1345,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - A package can export a <link linkend="ssec-setup-hooks">setup - hook</link> by setting this variable. The setup hook, if defined, is - copied to <filename>$out/nix-support/setup-hook</filename>. Environment - variables are then substituted in it using - <function + A package can export a <link linkend="ssec-setup-hooks">setup hook</link> by setting this variable. The setup hook, if defined, is copied to <filename>$out/nix-support/setup-hook</filename>. Environment variables are then substituted in it using <function linkend="fun-substituteAll">substituteAll</function>. </para> </listitem> @@ -1795,25 +1376,14 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - If set to <literal>true</literal>, the standard environment will enable - debug information in C/C++ builds. After installation, the debug - information will be separated from the executables and stored in the - output named <literal>debug</literal>. (This output is enabled - automatically; you don’t need to set the <varname>outputs</varname> - attribute explicitly.) To be precise, the debug information is stored in - <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>, - where <replaceable>XXYYYY…</replaceable> is the <replaceable>build - ID</replaceable> of the binary — a SHA-1 hash of the contents of the - binary. Debuggers like GDB use the build ID to look up the separated - debug information. + If set to <literal>true</literal>, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named <literal>debug</literal>. (This output is enabled automatically; you don’t need to set the <varname>outputs</varname> attribute explicitly.) To be precise, the debug information is stored in <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>, where <replaceable>XXYYYY…</replaceable> is the <replaceable>build ID</replaceable> of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information. </para> <para> For example, with GDB, you can add <programlisting> set debug-file-directory ~/.nix-profile/lib/debug </programlisting> - to <filename>~/.gdbinit</filename>. GDB will then be able to find debug - information installed via <literal>nix-env -i</literal>. + to <filename>~/.gdbinit</filename>. GDB will then be able to find debug information installed via <literal>nix-env -i</literal>. </para> </listitem> </varlistentry> @@ -1824,10 +1394,7 @@ set debug-file-directory ~/.nix-profile/lib/debug <title>The installCheck phase</title> <para> - The installCheck phase checks whether the package was installed correctly - by running its test suite against the installed directories. The default - <function>installCheck</function> calls <command>make - installcheck</command>. + The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default <function>installCheck</function> calls <command>make installcheck</command>. </para> <variablelist> @@ -1838,14 +1405,9 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - Controls whether the installCheck phase is executed. By default it is - skipped, but if <varname>doInstallCheck</varname> is set to true, the - installCheck phase is usually executed. Thus you should set + Controls whether the installCheck phase is executed. By default it is skipped, but if <varname>doInstallCheck</varname> is set to true, the installCheck phase is usually executed. Thus you should set <programlisting>doInstallCheck = true;</programlisting> - in the derivation to enable install checks. The exception is cross - compilation. Cross compiled builds never run tests, no matter how - <varname>doInstallCheck</varname> is set, as the newly-built program - won't run on the platform used to build it. + in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how <varname>doInstallCheck</varname> is set, as the newly-built program won't run on the platform used to build it. </para> </listitem> </varlistentry> @@ -1855,8 +1417,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - The make target that runs the install tests. Defaults to - <literal>installcheck</literal>. + The make target that runs the install tests. Defaults to <literal>installcheck</literal>. </para> </listitem> </varlistentry> @@ -1866,9 +1427,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - A list of strings passed as additional flags to <command>make</command>. - Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, - but only used by the installCheck phase. + A list of strings passed as additional flags to <command>make</command>. Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>, but only used by the installCheck phase. </para> </listitem> </varlistentry> @@ -1878,9 +1437,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - A list of dependencies used by the phase. This gets included in - <varname>nativeBuildInputs</varname> when - <varname>doInstallCheck</varname> is set. + A list of dependencies used by the phase. This gets included in <varname>nativeBuildInputs</varname> when <varname>doInstallCheck</varname> is set. </para> </listitem> </varlistentry> @@ -1911,11 +1468,7 @@ set debug-file-directory ~/.nix-profile/lib/debug <title>The distribution phase</title> <para> - The distribution phase is intended to produce a source distribution of the - package. The default <function>distPhase</function> first calls - <command>make dist</command>, then it copies the resulting source tarballs - to <filename>$out/tarballs/</filename>. This phase is only executed if the - attribute <varname>doDist</varname> is set. + The distribution phase is intended to produce a source distribution of the package. The default <function>distPhase</function> first calls <command>make dist</command>, then it copies the resulting source tarballs to <filename>$out/tarballs/</filename>. This phase is only executed if the attribute <varname>doDist</varname> is set. </para> <variablelist> @@ -1926,8 +1479,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - The make target that produces the distribution. Defaults to - <literal>dist</literal>. + The make target that produces the distribution. Defaults to <literal>dist</literal>. </para> </listitem> </varlistentry> @@ -1947,9 +1499,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - The names of the source distribution files to be copied to - <filename>$out/tarballs/</filename>. It can contain shell wildcards. The - default is <filename>*.tar.gz</filename>. + The names of the source distribution files to be copied to <filename>$out/tarballs/</filename>. It can contain shell wildcards. The default is <filename>*.tar.gz</filename>. </para> </listitem> </varlistentry> @@ -2000,8 +1550,7 @@ set debug-file-directory ~/.nix-profile/lib/debug </term> <listitem> <para> - Constructs a wrapper for a program with various possible arguments. For - example: + Constructs a wrapper for a program with various possible arguments. For example: <programlisting> # adds `FOOBAR=baz` to `$out/bin/foo`’s environment makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz @@ -2011,12 +1560,10 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz # (via string replacements or in `configurePhase`). makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} </programlisting> - There’s many more kinds of arguments, they are documented in - <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>. + There’s many more kinds of arguments, they are documented in <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>. </para> <para> - <literal>wrapProgram</literal> is a convenience function you probably - want to use most of the time. + <literal>wrapProgram</literal> is a convenience function you probably want to use most of the time. </para> </listitem> </varlistentry> @@ -2026,10 +1573,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello </term> <listitem> <para> - Performs string substitution on the contents of - <replaceable>infile</replaceable>, writing the result to - <replaceable>outfile</replaceable>. The substitutions in - <replaceable>subs</replaceable> are of the following form: + Performs string substitution on the contents of <replaceable>infile</replaceable>, writing the result to <replaceable>outfile</replaceable>. The substitutions in <replaceable>subs</replaceable> are of the following form: <variablelist> <varlistentry> <term> @@ -2037,8 +1581,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello </term> <listitem> <para> - Replace every occurrence of the string <replaceable>s1</replaceable> - by <replaceable>s2</replaceable>. + Replace every occurrence of the string <replaceable>s1</replaceable> by <replaceable>s2</replaceable>. </para> </listitem> </varlistentry> @@ -2048,13 +1591,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello </term> <listitem> <para> - Replace every occurrence of - <literal>@<replaceable>varName</replaceable>@</literal> by the - contents of the environment variable - <replaceable>varName</replaceable>. This is useful for generating - files from templates, using - <literal>@<replaceable>...</replaceable>@</literal> in the template - as placeholders. + Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the contents of the environment variable <replaceable>varName</replaceable>. This is useful for generating files from templates, using <literal>@<replaceable>...</replaceable>@</literal> in the template as placeholders. </para> </listitem> </varlistentry> @@ -2064,9 +1601,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello </term> <listitem> <para> - Replace every occurrence of - <literal>@<replaceable>varName</replaceable>@</literal> by the string - <replaceable>s</replaceable>. + Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the string <replaceable>s</replaceable>. </para> </listitem> </varlistentry> @@ -2082,14 +1617,8 @@ substitute ./foo.in ./foo.out \ </programlisting> </para> <para> - <function>substitute</function> is implemented using the - <command - xlink:href="http://replace.richardlloyd.org.uk/">replace</command> - command. Unlike with the <command>sed</command> command, you don’t have - to worry about escaping special characters. It supports performing - substitutions on binary files (such as executables), though there - you’ll probably want to make sure that the replacement string is as - long as the replaced string. + <function>substitute</function> is implemented using the <command + xlink:href="http://replace.richardlloyd.org.uk/">replace</command> command. Unlike with the <command>sed</command> command, you don’t have to worry about escaping special characters. It supports performing substitutions on binary files (such as executables), though there you’ll probably want to make sure that the replacement string is as long as the replaced string. </para> </listitem> </varlistentry> @@ -2099,8 +1628,7 @@ substitute ./foo.in ./foo.out \ </term> <listitem> <para> - Like <function>substitute</function>, but performs the substitutions in - place on the file <replaceable>file</replaceable>. + Like <function>substitute</function>, but performs the substitutions in place on the file <replaceable>file</replaceable>. </para> </listitem> </varlistentry> @@ -2110,22 +1638,13 @@ substitute ./foo.in ./foo.out \ </term> <listitem> <para> - Replaces every occurrence of - <literal>@<replaceable>varName</replaceable>@</literal>, where - <replaceable>varName</replaceable> is any environment variable, in - <replaceable>infile</replaceable>, writing the result to - <replaceable>outfile</replaceable>. For instance, if - <replaceable>infile</replaceable> has the contents + Replaces every occurrence of <literal>@<replaceable>varName</replaceable>@</literal>, where <replaceable>varName</replaceable> is any environment variable, in <replaceable>infile</replaceable>, writing the result to <replaceable>outfile</replaceable>. For instance, if <replaceable>infile</replaceable> has the contents <programlisting> #! @bash@/bin/sh PATH=@coreutils@/bin echo @foo@ </programlisting> - and the environment contains - <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal> and - <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>, - but does not contain the variable <varname>foo</varname>, then the output - will be + and the environment contains <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal> and <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>, but does not contain the variable <varname>foo</varname>, then the output will be <programlisting> #! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin @@ -2134,13 +1653,7 @@ echo @foo@ That is, no substitution is performed for undefined variables. </para> <para> - Environment variables that start with an uppercase letter or an - underscore are filtered out, to prevent global variables (like - <literal>HOME</literal>) or private variables (like - <literal>__ETC_PROFILE_DONE</literal>) from accidentally getting - substituted. The variables also have to be valid bash “names”, as - defined in the bash manpage (alphanumeric or <literal>_</literal>, must - not start with a number). + Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like <literal>HOME</literal>) or private variables (like <literal>__ETC_PROFILE_DONE</literal>) from accidentally getting substituted. The variables also have to be valid bash “names”, as defined in the bash manpage (alphanumeric or <literal>_</literal>, must not start with a number). </para> </listitem> </varlistentry> @@ -2150,8 +1663,7 @@ echo @foo@ </term> <listitem> <para> - Like <function>substituteAll</function>, but performs the substitutions - in place on the file <replaceable>file</replaceable>. + Like <function>substituteAll</function>, but performs the substitutions in place on the file <replaceable>file</replaceable>. </para> </listitem> </varlistentry> @@ -2161,14 +1673,12 @@ echo @foo@ </term> <listitem> <para> - Strips the directory and hash part of a store path, outputting the name - part to <literal>stdout</literal>. For example: + Strips the directory and hash part of a store path, outputting the name part to <literal>stdout</literal>. For example: <programlisting> # prints coreutils-8.24 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" </programlisting> - If you wish to store the result in another variable, then the following - idiom may be useful: + If you wish to store the result in another variable, then the following idiom may be useful: <programlisting> name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" someVar=$(stripHash $name) @@ -2182,13 +1692,10 @@ someVar=$(stripHash $name) </term> <listitem> <para> - Convenience function for <literal>makeWrapper</literal> that - automatically creates a sane wrapper file It takes all the same arguments - as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>. + Convenience function for <literal>makeWrapper</literal> that automatically creates a sane wrapper file It takes all the same arguments as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>. </para> <para> - It cannot be applied multiple times, since it will overwrite the wrapper - file. + It cannot be applied multiple times, since it will overwrite the wrapper file. </para> </listitem> </varlistentry> @@ -2198,85 +1705,34 @@ someVar=$(stripHash $name) <title>Package setup hooks</title> <para> - Nix itself considers a build-time dependency as merely something that should - previously be built and accessible at build time—packages themselves are - on their own to perform any additional setup. In most cases, that is fine, - and the downstream derivation can deal with its own dependencies. But for a - few common tasks, that would result in almost every package doing the same - sort of setup work—depending not on the package itself, but entirely on - which dependencies were used. + Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. </para> <para> - In order to alleviate this burden, the <firstterm>setup hook</firstterm> - mechanism was written, where any package can include a shell script that [by - convention rather than enforcement by Nix], any downstream - reverse-dependency will source as part of its build process. That allows the - downstream dependency to merely specify its dependencies, and lets those - dependencies effectively initialize themselves. No boilerplate mirroring the - list of dependencies is needed. + In order to alleviate this burden, the <firstterm>setup hook</firstterm> mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. </para> <para> - The setup hook mechanism is a bit of a sledgehammer though: a powerful - feature with a broad and indiscriminate area of effect. The combination of - its power and implicit use may be expedient, but isn't without costs. Nix - itself is unchanged, but the spirit of added dependencies being effect-free - is violated even if the letter isn't. For example, if a derivation path is - mentioned more than once, Nix itself doesn't care and simply makes sure the - dependency derivation is already built just the same—depending is just - needing something to exist, and needing is idempotent. However, a dependency - specified twice will have its setup hook run twice, and that could easily - change the build environment (though a well-written setup hook will - therefore strive to be idempotent so this is in fact not observable). More - broadly, setup hooks are anti-modular in that multiple dependencies, whether - the same or different, should not interfere and yet their setup hooks may - well do so. + The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn't without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn't. For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. </para> <para> - The most typical use of the setup hook is actually to add other hooks which - are then run (i.e. after all the setup hooks) on each dependency. For - example, the C compiler wrapper's setup hook feeds itself flags for each - dependency that contains relevant libraries and headers. This is done by - defining a bash function, and appending its name to one of - <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`, - <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`, - <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`. - These 6 bash variables correspond to the 6 sorts of dependencies by platform - (there's 12 total but we ignore the propagated/non-propagated axis). + The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`, <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`, <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). </para> <para> - Packages adding a hook should not hard code a specific hook, but rather - choose a variable <emphasis>relative</emphasis> to how they are included. - Returning to the C compiler wrapper example, if the wrapper itself is an - <literal>n</literal> dependency, then it only wants to accumulate flags from - <literal>n + 1</literal> dependencies, as only those ones match the - compiler's target platform. The <envar>hostOffset</envar> variable is - defined with the current dependency's host offset - <envar>targetOffset</envar> with its target offset, before its setup hook is - sourced. Additionally, since most environment hooks don't care about the - target platform, that means the setup hook can append to the right bash - array by doing something like + Packages adding a hook should not hard code a specific hook, but rather choose a variable <emphasis>relative</emphasis> to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an <literal>n</literal> dependency, then it only wants to accumulate flags from <literal>n + 1</literal> dependencies, as only those ones match the compiler's target platform. The <envar>hostOffset</envar> variable is defined with the current dependency's host offset <envar>targetOffset</envar> with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don't care about the target platform, that means the setup hook can append to the right bash array by doing something like <programlisting language="bash"> addEnvHooks "$hostOffset" myBashFunction </programlisting> </para> <para> - The <emphasis>existence</emphasis> of setups hooks has long been documented - and packages inside Nixpkgs are free to use this mechanism. Other packages, - however, should not rely on these mechanisms not changing between Nixpkgs - versions. Because of the existing issues with this system, there's little - benefit from mandating it be stable for any period of time. + The <emphasis>existence</emphasis> of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. </para> <para> - First, let’s cover some setup hooks that are part of Nixpkgs default - stdenv. This means that they are run for every package built using - <function>stdenv.mkDerivation</function>. Some of these are platform - specific, so they may run on Linux but not Darwin or vice-versa. + First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using <function>stdenv.mkDerivation</function>. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. <variablelist> <varlistentry> <term> @@ -2284,10 +1740,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook moves any installed documentation to the - <literal>/share</literal> subdirectory directory. This includes the man, - doc and info directories. This is needed for legacy programs that do not - know how to use the <literal>share</literal> subdirectory. + This setup hook moves any installed documentation to the <literal>/share</literal> subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the <literal>share</literal> subdirectory. </para> </listitem> </varlistentry> @@ -2297,9 +1750,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook compresses any man pages that have been installed. The - compression is done using the gzip program. This helps to reduce the - installed size of packages. + This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. </para> </listitem> </varlistentry> @@ -2309,9 +1760,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This runs the strip command on installed binaries and libraries. This - removes unnecessary information like debug symbols when they are not - needed. This also helps to reduce the installed size of packages. + This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. </para> </listitem> </varlistentry> @@ -2321,12 +1770,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook patches installed scripts to use the full path to the - shebang interpreter. A shebang interpreter is the first commented line - of a script telling the operating system which program will run the - script (e.g <literal>#!/bin/bash</literal>). In Nix, we want an exact - path to that interpreter to be used. This often replaces - <literal>/bin/sh</literal> with a path in the Nix store. + This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g <literal>#!/bin/bash</literal>). In Nix, we want an exact path to that interpreter to be used. This often replaces <literal>/bin/sh</literal> with a path in the Nix store. </para> </listitem> </varlistentry> @@ -2336,10 +1780,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This verifies that no references are left from the install binaries to - the directory used to build those binaries. This ensures that the - binaries do not need things outside the Nix store. This is currently - supported in Linux only. + This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. </para> </listitem> </varlistentry> @@ -2349,12 +1790,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook adds configure flags that tell packages to install files - into any one of the proper outputs listed in <literal>outputs</literal>. - This behavior can be turned off by setting - <literal>setOutputFlags</literal> to false in the derivation - environment. See <xref linkend="chap-multiple-output"/> for more - information. + This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in <literal>outputs</literal>. This behavior can be turned off by setting <literal>setOutputFlags</literal> to false in the derivation environment. See <xref linkend="chap-multiple-output"/> for more information. </para> </listitem> </varlistentry> @@ -2364,9 +1800,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook moves any binaries installed in the sbin subdirectory - into bin. In addition, a link is provided from sbin to bin for - compatibility. + This setup hook moves any binaries installed in the sbin subdirectory into bin. In addition, a link is provided from sbin to bin for compatibility. </para> </listitem> </varlistentry> @@ -2376,9 +1810,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This setup hook moves any libraries installed in the lib64 subdirectory - into lib. In addition, a link is provided from lib64 to lib for - compatibility. + This setup hook moves any libraries installed in the lib64 subdirectory into lib. In addition, a link is provided from lib64 to lib for compatibility. </para> </listitem> </varlistentry> @@ -2388,8 +1820,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This sets <literal>SOURCE_DATE_EPOCH</literal> to the modification time - of the most recent file. + This sets <literal>SOURCE_DATE_EPOCH</literal> to the modification time of the most recent file. </para> </listitem> </varlistentry> @@ -2399,70 +1830,22 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - The Bintools Wrapper wraps the binary utilities for a bunch of - miscellaneous purposes. These are GNU Binutils when targetting Linux, - and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name - is supposed to be a compromise between "Binutils" and "cctools" not - denoting any specific implementation.] Specifically, the underlying - bintools package, and a C standard library (glibc or Darwin's libSystem, - just for the dynamic loader) are all fed in, and dependency finding, - hardening (see below), and purity checks for each are handled by the - Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn - (at run time) depends on the Bintools Wrapper. - </para> - <para> - The Bintools Wrapper was only just recently split off from CC Wrapper, - so the division of labor is still being worked out. For example, it - shouldn't care about the C standard library, but just take a derivation - with the dynamic loader (which happens to be the glibc on linux). - Dependency finding however is a task both wrappers will continue to need - to share, and probably the most important to understand. It is currently - accomplished by collecting directories of host-platform dependencies - (i.e. <varname>buildInputs</varname> and - <varname>nativeBuildInputs</varname>) in environment variables. The - Bintools Wrapper's setup hook causes any <filename>lib</filename> and - <filename>lib64</filename> subdirectories to be added to - <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools - Wrapper use the same strategy, most of the Bintools Wrapper code is - sparsely commented and refers to the CC Wrapper. But the CC Wrapper's - code, by contrast, has quite lengthy comments. The Bintools Wrapper - merely cites those, rather than repeating them, to avoid falling out of - sync. - </para> - <para> - A final task of the setup hook is defining a number of standard - environment variables to tell build systems which executables fulfill - which purpose. They are defined to just be the base name of the tools, - under the assumption that the Bintools Wrapper's binaries will be on the - path. Firstly, this helps poorly-written packages, e.g. ones that look - for just <command>gcc</command> when <envar>CC</envar> isn't defined yet - <command>clang</command> is to be used. Secondly, this helps packages - not get confused when cross-compiling, in which case multiple Bintools - Wrappers may simultaneously be in use. + The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. + </para> + <para> + The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn't care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>) in environment variables. The Bintools Wrapper's setup hook causes any <filename>lib</filename> and <filename>lib64</filename> subdirectories to be added to <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper's code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. + </para> + <para> + A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just <command>gcc</command> when <envar>CC</envar> isn't defined yet <command>clang</command> is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. <footnote xml:id="footnote-stdenv-per-platform-wrapper"> <para> - Each wrapper targets a single platform, so if binaries for multiple - platforms are needed, the underlying binaries must be wrapped multiple - times. As this is a property of the wrapper itself, the multiple - wrappings are needed whether or not the same underlying binaries can - target multiple platforms. + Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. </para> </footnote> - <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of - the normal environment variable are defined for additional Bintools - Wrappers, properly disambiguating them. + <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them. </para> <para> - A problem with this final task is that the Bintools Wrapper is honest - and defines <envar>LD</envar> as <command>ld</command>. Most packages, - however, firstly use the C compiler for linking, secondly use - <envar>LD</envar> anyways, defining it as the C compiler, and thirdly, - only so define <envar>LD</envar> when it is undefined as a fallback. - This triple-threat means Bintools Wrapper will break those packages, as - LD is already defined as the actual linker which the package won't - override yet doesn't want to use. The workaround is to define, just for - the problematic package, <envar>LD</envar> as the C compiler. A good way - to do this would be <command>preConfigure = "LD=$CC"</command>. + A problem with this final task is that the Bintools Wrapper is honest and defines <envar>LD</envar> as <command>ld</command>. Most packages, however, firstly use the C compiler for linking, secondly use <envar>LD</envar> anyways, defining it as the C compiler, and thirdly, only so define <envar>LD</envar> when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, <envar>LD</envar> as the C compiler. A good way to do this would be <command>preConfigure = "LD=$CC"</command>. </para> </listitem> </varlistentry> @@ -2472,31 +1855,13 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - The CC Wrapper wraps a C toolchain for a bunch of miscellaneous - purposes. Specifically, a C compiler (GCC or Clang), wrapped binary - tools, and a C standard library (glibc or Darwin's libSystem, just for - the dynamic loader) are all fed in, and dependency finding, hardening - (see below), and purity checks for each are handled by the CC Wrapper. - Packages typically depend on the CC Wrapper, which in turn (at run-time) - depends on the Bintools Wrapper. + The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. </para> <para> - Dependency finding is undoubtedly the main task of the CC Wrapper. This - works just like the Bintools Wrapper, except that any - <filename>include</filename> subdirectory of any relevant dependency is - added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself - contains some lengthy comments describing the exact convoluted mechanism - by which this is accomplished. + Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any <filename>include</filename> subdirectory of any relevant dependency is added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. </para> <para> - Similarly, the CC Wrapper follows the Bintools Wrapper in defining - standard environment variables with the names of the tools it wraps, for - the same reasons described above. Importantly, while it includes a - <command>cc</command> symlink to the c compiler for portability, the - <envar>CC</envar> will be defined using the compiler's "real name" (i.e. - <command>gcc</command> or <command>clang</command>). This helps lousy - build systems that inspect on the name of the compiler rather than run - it. + Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a <command>cc</command> symlink to the c compiler for portability, the <envar>CC</envar> will be defined using the compiler's "real name" (i.e. <command>gcc</command> or <command>clang</command>). This helps lousy build systems that inspect on the name of the compiler rather than run it. </para> </listitem> </varlistentry> @@ -2504,9 +1869,7 @@ addEnvHooks "$hostOffset" myBashFunction </para> <para> - Here are some more packages that provide a setup hook. Since the list of - hooks is extensible, this is not an exhaustive list the mechanism is only to - be used as a last resort, it might cover most uses. + Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list the mechanism is only to be used as a last resort, it might cover most uses. <variablelist> <varlistentry> <term> @@ -2514,11 +1877,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds the <filename>lib/site_perl</filename> subdirectory of each build - input to the <envar>PERL5LIB</envar> environment variable. For instance, - if <varname>buildInputs</varname> contains Perl, then the - <filename>lib/site_perl</filename> subdirectory of each input is added - to the <envar>PERL5LIB</envar> environment variable. + Adds the <filename>lib/site_perl</filename> subdirectory of each build input to the <envar>PERL5LIB</envar> environment variable. For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable. </para> </listitem> </varlistentry> @@ -2528,9 +1887,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds the <filename>lib/${python.libPrefix}/site-packages</filename> - subdirectory of each build input to the <envar>PYTHONPATH</envar> - environment variable. + Adds the <filename>lib/${python.libPrefix}/site-packages</filename> subdirectory of each build input to the <envar>PYTHONPATH</envar> environment variable. </para> </listitem> </varlistentry> @@ -2540,9 +1897,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds the <filename>lib/pkgconfig</filename> and - <filename>share/pkgconfig</filename> subdirectories of each build input - to the <envar>PKG_CONFIG_PATH</envar> environment variable. + Adds the <filename>lib/pkgconfig</filename> and <filename>share/pkgconfig</filename> subdirectories of each build input to the <envar>PKG_CONFIG_PATH</envar> environment variable. </para> </listitem> </varlistentry> @@ -2552,8 +1907,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds the <filename>share/aclocal</filename> subdirectory of each build - input to the <envar>ACLOCAL_PATH</envar> environment variable. + Adds the <filename>share/aclocal</filename> subdirectory of each build input to the <envar>ACLOCAL_PATH</envar> environment variable. </para> </listitem> </varlistentry> @@ -2563,12 +1917,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - The <varname>autoreconfHook</varname> derivation adds - <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize - and automake, essentially preparing the configure script in - autotools-based builds. Most autotools-based packages come with the - configure script pre-generated, but this hook is necessary for a few - packages and when you need to patch the package’s configure scripts. + The <varname>autoreconfHook</varname> derivation adds <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. </para> </listitem> </varlistentry> @@ -2578,10 +1927,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds every file named <filename>catalog.xml</filename> found under the - <filename>xml/dtd</filename> and <filename>xml/xsl</filename> - subdirectories of each build input to the - <envar>XML_CATALOG_FILES</envar> environment variable. + Adds every file named <filename>catalog.xml</filename> found under the <filename>xml/dtd</filename> and <filename>xml/xsl</filename> subdirectories of each build input to the <envar>XML_CATALOG_FILES</envar> environment variable. </para> </listitem> </varlistentry> @@ -2591,8 +1937,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Adds the <filename>share/texmf-nix</filename> subdirectory of each build - input to the <envar>TEXINPUTS</envar> environment variable. + Adds the <filename>share/texmf-nix</filename> subdirectory of each build input to the <envar>TEXINPUTS</envar> environment variable. </para> </listitem> </varlistentry> @@ -2612,9 +1957,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to - the builder. Add librsvg package to <varname>buildInputs</varname> to - get svg support. + Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the builder. Add librsvg package to <varname>buildInputs</varname> to get svg support. </para> </listitem> </varlistentry> @@ -2624,8 +1967,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Creates a temporary package database and registers every Haskell build - input in it (TODO: how?). + Creates a temporary package database and registers every Haskell build input in it (TODO: how?). </para> </listitem> </varlistentry> @@ -2635,8 +1977,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Hooks related to GNOME platform and related libraries like GLib, GTK and - GStreamer are described in <xref linkend="sec-language-gnome" />. + Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />. </para> </listitem> </varlistentry> @@ -2646,15 +1987,10 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This is a special setup hook which helps in packaging proprietary - software in that it automatically tries to find missing shared library - dependencies of ELF files based on the given - <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>. + This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>. </para> <para> - You can also specify a <envar>runtimeDependencies</envar> environment - variable which lists dependencies that are unconditionally added to all - executables. + You can also specify a <envar>runtimeDependencies</envar> environment variable which lists dependencies that are unconditionally added to all executables. </para> <para> This is useful for programs that use <citerefentry> @@ -2662,16 +1998,10 @@ addEnvHooks "$hostOffset" myBashFunction <manvolnum>3</manvolnum> </citerefentry> to load libraries at runtime. </para> <para> - In certain situations you may want to run the main command - (<command>autoPatchelf</command>) of the setup hook on a file or a set - of directories instead of unconditionally patching all outputs. This can - be done by setting the <envar>dontAutoPatchelf</envar> environment - variable to a non-empty value. + In certain situations you may want to run the main command (<command>autoPatchelf</command>) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the <envar>dontAutoPatchelf</envar> environment variable to a non-empty value. </para> <para> - The <command>autoPatchelf</command> command also recognizes a - <parameter class="command">--no-recurse</parameter> command line flag, - which prevents it from recursing into subdirectories. + The <command>autoPatchelf</command> command also recognizes a <parameter class="command">--no-recurse</parameter> command line flag, which prevents it from recursing into subdirectories. </para> </listitem> </varlistentry> @@ -2681,36 +2011,16 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - This hook will make a build pause instead of stopping when a failure - happens. It prevents nix from cleaning up the build environment - immediately and allows the user to attach to a build environment using - the <command>cntr</command> command. Upon build error it will print - instructions on how to use <command>cntr</command>, which can be used to - enter the environment for debugging. Installing cntr and running the - command will provide shell access to the build sandbox of failed build. - At <filename>/var/lib/cntr</filename> the sandboxed filesystem is - mounted. All commands and files of the system are still accessible - within the shell. To execute commands from the sandbox use the cntr exec - subcommand. <command>cntr</command> is only supported on Linux-based - platforms. To use it first add <literal>cntr</literal> to your - <literal>environment.systemPackages</literal> on NixOS or alternatively - to the root user on non-NixOS systems. Then in the package that is - supposed to be inspected, add <literal>breakpointHook</literal> to - <literal>nativeBuildInputs</literal>. + This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the <command>cntr</command> command. Upon build error it will print instructions on how to use <command>cntr</command>, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At <filename>/var/lib/cntr</filename> the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. <command>cntr</command> is only supported on Linux-based platforms. To use it first add <literal>cntr</literal> to your <literal>environment.systemPackages</literal> on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add <literal>breakpointHook</literal> to <literal>nativeBuildInputs</literal>. <programlisting> nativeBuildInputs = [ breakpointHook ]; </programlisting> - When a build failure happens there will be an instruction printed that - shows how to attach with <literal>cntr</literal> to the build sandbox. + When a build failure happens there will be an instruction printed that shows how to attach with <literal>cntr</literal> to the build sandbox. </para> <note> <title>Caution with remote builds</title> <para> - This won't work with remote builds as the build environment is on a - different machine and can't be accessed by <command>cntr</command>. - Remote builds can be turned off by setting <literal>--option builders - ''</literal> for <command>nix-build</command> or <literal>--builders - ''</literal> for <command>nix build</command>. + This won't work with remote builds as the build environment is on a different machine and can't be accessed by <command>cntr</command>. Remote builds can be turned off by setting <literal>--option builders ''</literal> for <command>nix-build</command> or <literal>--builders ''</literal> for <command>nix build</command>. </para> </note> </listitem> @@ -2721,28 +2031,13 @@ nativeBuildInputs = [ breakpointHook ]; </term> <listitem> <para> - This hook helps with installing manpages and shell completion files. It - exposes 2 shell functions <literal>installManPage</literal> and - <literal>installShellCompletion</literal> that can be used from your - <literal>postInstall</literal> hook. + This hook helps with installing manpages and shell completion files. It exposes 2 shell functions <literal>installManPage</literal> and <literal>installShellCompletion</literal> that can be used from your <literal>postInstall</literal> hook. </para> <para> - The <literal>installManPage</literal> function takes one or more paths - to manpages to install. The manpages must have a section suffix, and may - optionally be compressed (with <literal>.gz</literal> suffix). This - function will place them into the correct directory. + The <literal>installManPage</literal> function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with <literal>.gz</literal> suffix). This function will place them into the correct directory. </para> <para> - The <literal>installShellCompletion</literal> function takes one or more - paths to shell completion files. By default it will autodetect the shell - type from the completion file extension, but you may also specify it by - passing one of <literal>--bash</literal>, <literal>--fish</literal>, or - <literal>--zsh</literal>. These flags apply to all paths listed after - them (up until another shell flag is given). Each path may also have a - custom installation name provided by providing a flag <literal>--name - NAME</literal> before the path. If this flag is not provided, zsh - completions will be renamed automatically such that - <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>. + The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>. <programlisting> nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -2764,13 +2059,7 @@ postInstall = '' </term> <listitem> <para> - A few libraries automatically add to <literal>NIX_LDFLAGS</literal> - their library, making their symbols automatically available to the - linker. This includes libiconv and libintl (gettext). This is done to - provide compatibility between GNU Linux, where libiconv and libintl are - bundled in, and other systems where that might not be the case. - Sometimes, this behavior is not desired. To disable this behavior, set - <literal>dontAddExtraLibs</literal>. + A few libraries automatically add to <literal>NIX_LDFLAGS</literal> their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set <literal>dontAddExtraLibs</literal>. </para> </listitem> </varlistentry> @@ -2780,16 +2069,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the default configure phase to run the CMake command. By - default, we use the Make generator of CMake. In addition, dependencies - are added automatically to CMAKE_PREFIX_PATH so that packages are - correctly detected by CMake. Some additional flags are passed in to give - similar behavior to configure-based packages. You can disable this - hook’s behavior by setting configurePhase to a custom value, or by - setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to - CMake. By default, parallel building is enabled as CMake supports - parallel building almost everywhere. When Ninja is also in use, CMake - will detect that and use the ninja generator. + Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. </para> </listitem> </varlistentry> @@ -2799,11 +2079,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the build and install phases to run the “xcbuild” command. - This hook is needed when a project only comes with build files for the - XCode build system. You can disable this behavior by setting buildPhase - and configurePhase to a custom value. xcbuildFlags controls flags passed - only to xcbuild. + Overrides the build and install phases to run the “xcbuild” command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. </para> </listitem> </varlistentry> @@ -2813,10 +2089,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the configure phase to run meson to generate Ninja files. To - run these files, you should accompany Meson with ninja. By default, - <varname>enableParallelBuilding</varname> is enabled as Meson supports - parallel building almost everywhere. + Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, <varname>enableParallelBuilding</varname> is enabled as Meson supports parallel building almost everywhere. </para> <variablelist> <title>Variables controlling Meson</title> @@ -2836,10 +2109,8 @@ postInstall = '' </term> <listitem> <para> - Which - <link - xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>--buildtype</command></link> - to pass to Meson. We default to <literal>plain</literal>. + Which <link + xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>--buildtype</command></link> to pass to Meson. We default to <literal>plain</literal>. </para> </listitem> </varlistentry> @@ -2849,10 +2120,8 @@ postInstall = '' </term> <listitem> <para> - What value to set - <link - xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dauto_features=</command></link> - to. We default to <command>enabled</command>. + What value to set <link + xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dauto_features=</command></link> to. We default to <command>enabled</command>. </para> </listitem> </varlistentry> @@ -2862,11 +2131,8 @@ postInstall = '' </term> <listitem> <para> - What value to set - <link - xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dwrap_mode=</command></link> - to. We default to <command>nodownload</command> as we disallow - network access. + What value to set <link + xlink:href="https://mesonbuild.com/Builtin-options.html#core-options"><command>-Dwrap_mode=</command></link> to. We default to <command>nodownload</command> as we disallow network access. </para> </listitem> </varlistentry> @@ -2889,10 +2155,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the build, install, and check phase to run ninja instead of - make. You can disable this behavior with the dontUseNinjaBuild, - dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel - building is enabled by default in Ninja. + Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the dontUseNinjaBuild, dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel building is enabled by default in Ninja. </para> </listitem> </varlistentry> @@ -2902,8 +2165,7 @@ postInstall = '' </term> <listitem> <para> - This setup hook will allow you to unzip .zip files specified in $src. - There are many similar packages like unrar, undmg, etc. + This setup hook will allow you to unzip .zip files specified in $src. There are many similar packages like unrar, undmg, etc. </para> </listitem> </varlistentry> @@ -2913,10 +2175,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the configure, build, and install phases. This will run the - "waf" script used by many projects. If wafPath (default ./waf) doesn’t - exist, it will copy the version of waf available in Nixpkgs. wafFlags - can be used to pass flags to the waf script. + Overrides the configure, build, and install phases. This will run the "waf" script used by many projects. If wafPath (default ./waf) doesn’t exist, it will copy the version of waf available in Nixpkgs. wafFlags can be used to pass flags to the waf script. </para> </listitem> </varlistentry> @@ -2926,9 +2185,7 @@ postInstall = '' </term> <listitem> <para> - Overrides the build, install, and check phases. This uses the scons - build system as a replacement for make. scons does not provide a - configure phase, so everything is managed at build and install time. + Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. </para> </listitem> </varlistentry> @@ -2939,40 +2196,26 @@ postInstall = '' <title>Purity in Nixpkgs</title> <para> - [measures taken to prevent dependencies on packages outside the store, and - what you can do to prevent them] + [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them] </para> <para> - GCC doesn't search in locations such as <filename>/usr/include</filename>. - In fact, attempts to add such directories through the <option>-I</option> - flag are filtered out. Likewise, the linker (from GNU binutils) doesn't - search in standard locations such as <filename>/usr/lib</filename>. Programs - built on Linux are linked against a GNU C Library that likewise doesn't - search in the default system locations. + GCC doesn't search in locations such as <filename>/usr/include</filename>. In fact, attempts to add such directories through the <option>-I</option> flag are filtered out. Likewise, the linker (from GNU binutils) doesn't search in standard locations such as <filename>/usr/lib</filename>. Programs built on Linux are linked against a GNU C Library that likewise doesn't search in the default system locations. </para> </section> <section xml:id="sec-hardening-in-nixpkgs"> <title>Hardening in Nixpkgs</title> <para> - There are flags available to harden packages at compile or link-time. These - can be toggled using the <varname>stdenv.mkDerivation</varname> parameters - <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>. + There are flags available to harden packages at compile or link-time. These can be toggled using the <varname>stdenv.mkDerivation</varname> parameters <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>. </para> <para> - Both parameters take a list of flags as strings. The special - <varname>"all"</varname> flag can be passed to - <varname>hardeningDisable</varname> to turn off all hardening. These flags - can also be used as environment variables for testing or development - purposes. + Both parameters take a list of flags as strings. The special <varname>"all"</varname> flag can be passed to <varname>hardeningDisable</varname> to turn off all hardening. These flags can also be used as environment variables for testing or development purposes. </para> <para> - The following flags are enabled by default and might require disabling with - <varname>hardeningDisable</varname> if the program to package is - incompatible. + The following flags are enabled by default and might require disabling with <varname>hardeningDisable</varname> if the program to package is incompatible. </para> <variablelist> @@ -2982,13 +2225,7 @@ postInstall = '' </term> <listitem> <para> - Adds the <option>-Wformat -Wformat-security - -Werror=format-security</option> compiler options. At present, this warns - about calls to <varname>printf</varname> and <varname>scanf</varname> - functions where the format string is not a string literal and there are - no format arguments, as in <literal>printf(foo);</literal>. This may be a - security hole if the format string came from untrusted input and contains - <literal>%n</literal>. + Adds the <option>-Wformat -Wformat-security -Werror=format-security</option> compiler options. At present, this warns about calls to <varname>printf</varname> and <varname>scanf</varname> functions where the format string is not a string literal and there are no format arguments, as in <literal>printf(foo);</literal>. This may be a security hole if the format string came from untrusted input and contains <literal>%n</literal>. </para> <para> This needs to be turned off or fixed for errors similar to: @@ -3007,12 +2244,7 @@ cc1plus: some warnings being treated as errors </term> <listitem> <para> - Adds the <option>-fstack-protector-strong --param - ssp-buffer-size=4</option> compiler options. This adds safety checks - against stack overwrites rendering many potential code injection attacks - into aborting situations. In the best case this turns code injection - vulnerabilities into denial of service or into non-issues (depending on - the application). + Adds the <option>-fstack-protector-strong --param ssp-buffer-size=4</option> compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). </para> <para> This needs to be turned off or fixed for errors similar to: @@ -3029,19 +2261,10 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': </term> <listitem> <para> - Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler options. - During code generation the compiler knows a great deal of information - about buffer sizes (where possible), and attempts to replace insecure - unlimited length buffer function calls with length-limited ones. This is - especially useful for old, crufty code. Additionally, format strings in - writable memory that contain '%n' are blocked. If an application depends - on such a format string, it will need to be worked around. + Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain '%n' are blocked. If an application depends on such a format string, it will need to be worked around. </para> <para> - Additionally, some warnings are enabled which might trigger build - failures if compiler warnings are treated as errors in the package build. - In this case, set <option>NIX_CFLAGS_COMPILE</option> to - <option>-Wno-error=warning-type</option>. + Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set <option>NIX_CFLAGS_COMPILE</option> to <option>-Wno-error=warning-type</option>. </para> <para> This needs to be turned off or fixed for errors similar to: @@ -3070,15 +2293,10 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro </term> <listitem> <para> - Adds the <option>-fPIC</option> compiler options. This options adds - support for position independent code in shared libraries and thus making - ASLR possible. + Adds the <option>-fPIC</option> compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. </para> <para> - Most notably, the Linux kernel, kernel modules and other code not running - in an operating system environment like boot loaders won't build with PIC - enabled. The compiler will is most cases complain that PIC is not - supported for a specific build. + Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build. </para> <para> This needs to be turned off or fixed for assembler errors similar to: @@ -3095,13 +2313,7 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le </term> <listitem> <para> - Signed integer overflow is undefined behaviour according to the C - standard. If it happens, it is an error in the program as it should check - for overflow before it can happen, not afterwards. GCC provides built-in - functions to perform arithmetic with overflow checking, which are correct - and faster than any custom implementation. As a workaround, the option - <option>-fno-strict-overflow</option> makes gcc behave as if signed - integer overflows were defined. + Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option <option>-fno-strict-overflow</option> makes gcc behave as if signed integer overflows were defined. </para> <para> This flag should not trigger any build or runtime errors. @@ -3114,18 +2326,10 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le </term> <listitem> <para> - Adds the <option>-z relro</option> linker option. During program load, - several ELF memory sections need to be written to by the linker, but can - be turned read-only before turning over control to the program. This - prevents some GOT (and .dtors) overwrite attacks, but at least the part - of the GOT used by the dynamic linker (.got.plt) is still vulnerable. + Adds the <option>-z relro</option> linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. </para> <para> - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and OpenCV are incompatible with this flag. In - almost all cases the <varname>bindnow</varname> flag must also be - disabled and incompatible programs typically fail with similar errors at - runtime. + This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the <varname>bindnow</varname> flag must also be disabled and incompatible programs typically fail with similar errors at runtime. </para> </listitem> </varlistentry> @@ -3135,18 +2339,10 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le </term> <listitem> <para> - Adds the <option>-z bindnow</option> linker option. During program load, - all dynamic symbols are resolved, allowing for the complete GOT to be - marked read-only (due to <varname>relro</varname>). This prevents GOT - overwrite attacks. For very large applications, this can incur some - performance loss during initial load while symbols are resolved, but this - shouldn't be an issue for daemons. + Adds the <option>-z bindnow</option> linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to <varname>relro</varname>). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn't be an issue for daemons. </para> <para> - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and PHP are incompatible with this flag. Programs - incompatible with this flag often fail at runtime due to missing symbols, - like: + This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: </para> <programlisting> intel_drv.so: undefined symbol: vgaHWFreeHWRec @@ -3156,9 +2352,7 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec </variablelist> <para> - The following flags are disabled by default and should be enabled with - <varname>hardeningEnable</varname> for packages that take untrusted input - like network services. + The following flags are disabled by default and should be enabled with <varname>hardeningEnable</varname> for packages that take untrusted input like network services. </para> <variablelist> @@ -3168,31 +2362,14 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec </term> <listitem> <para> - Adds the <option>-fPIE</option> compiler and <option>-pie</option> linker - options. Position Independent Executables are needed to take advantage of - Address Space Layout Randomization, supported by modern kernel versions. - While ASLR can already be enforced for data areas in the stack and heap - (brk and mmap), the code areas must be compiled as position-independent. - Shared libraries already do this with the <varname>pic</varname> flag, so - they gain ASLR automatically, but binary .text regions need to be build - with <varname>pie</varname> to gain ASLR. When this happens, ROP attacks - are much harder since there are no static locations to bounce off of - during a memory corruption attack. + Adds the <option>-fPIE</option> compiler and <option>-pie</option> linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the <varname>pic</varname> flag, so they gain ASLR automatically, but binary .text regions need to be build with <varname>pie</varname> to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. </para> </listitem> </varlistentry> </variablelist> <para> - For more in-depth information on these hardening flags and hardening in - general, refer to the - <link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>, - <link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu - Wiki</link>, - <link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo - Wiki</link>, and the - <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security"> - Arch Wiki</link>. + For more in-depth information on these hardening flags and hardening in general, refer to the <link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>, <link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu Wiki</link>, <link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Wiki</link>, and the <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security"> Arch Wiki</link>. </para> </section> </chapter> diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index a04ec08b048..2c7defb8174 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -8,8 +8,7 @@ <itemizedlist> <listitem> <para> - Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to - write packages for Nix)</link>. + Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>. </para> </listitem> <listitem> @@ -23,15 +22,11 @@ <itemizedlist> <listitem> <para> - You can make branch from a commit of your local - <command>nixos-version</command>. That will help you to avoid - additional local compilations. Because you will receive packages from - binary cache. + You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache. <itemizedlist> <listitem> <para> - For example: <command>nixos-version</command> returns - <command>15.05.git.0998212 (Dingo)</command>. So you can do: + For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do: </para> </listitem> </itemizedlist> @@ -55,9 +50,7 @@ <itemizedlist> <listitem> <para> - If you removed pkgs, made some major NixOS changes etc., write about - them in - <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>. + If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>. </para> </listitem> </itemizedlist> @@ -65,8 +58,7 @@ </listitem> <listitem> <para> - Check for unnecessary whitespace with <command>git diff --check</command> - before committing. + Check for unnecessary whitespace with <command>git diff --check</command> before committing. </para> </listitem> <listitem> @@ -121,8 +113,7 @@ Additional information. <itemizedlist> <listitem> <para> - <command>nix-env -i pkg-name -f <path to your local nixpkgs - folder></command> + <command>nix-env -i pkg-name -f <path to your local nixpkgs folder></command> </para> </listitem> </itemizedlist> @@ -134,14 +125,12 @@ Additional information. <itemizedlist> <listitem> <para> - Make sure it's in - <command>pkgs/top-level/all-packages.nix</command> + Make sure it's in <command>pkgs/top-level/all-packages.nix</command> </para> </listitem> <listitem> <para> - <command>nix-env -i pkg-name -f <path to your local nixpkgs - folder></command> + <command>nix-env -i pkg-name -f <path to your local nixpkgs folder></command> </para> </listitem> </itemizedlist> @@ -149,15 +138,11 @@ Additional information. </listitem> <listitem> <para> - <emphasis>If you don't want to install pkg in you - profile</emphasis>. + <emphasis>If you don't want to install pkg in you profile</emphasis>. <itemizedlist> <listitem> <para> - <command>nix-build -A pkg-attribute-name <path to your local - nixpkgs folder>/default.nix</command> and check results in the - folder <command>result</command>. It will appear in the same - directory where you did <command>nix-build</command>. + <command>nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>. </para> </listitem> </itemizedlist> @@ -165,9 +150,7 @@ Additional information. </listitem> <listitem> <para> - If you did <command>nix-env -i pkg-name</command> you can do - <command>nix-env -e pkg-name</command> to uninstall it from your - system. + If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system. </para> </listitem> </itemizedlist> @@ -179,10 +162,7 @@ Additional information. <itemizedlist> <listitem> <para> - You can add new module to your NixOS configuration file (usually - it's <command>/etc/nixos/configuration.nix</command>). And do - <command>sudo nixos-rebuild test -I nixpkgs=<path to your local - nixpkgs folder> --fast</command>. + You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>). And do <command>sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast</command>. </para> </listitem> </itemizedlist> @@ -193,9 +173,7 @@ Additional information. </listitem> <listitem> <para> - If you have commits <command>pkg-name: oh, forgot to insert - whitespace</command>: squash commits in this case. Use <command>git rebase - -i</command>. + If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>. </para> </listitem> <listitem> @@ -220,8 +198,7 @@ Additional information. <itemizedlist> <listitem> <para> - Write the title in format <command>(pkg-name | nixos/<module>): - improvement</command>. + Write the title in format <command>(pkg-name | nixos/<module>): improvement</command>. <itemizedlist> <listitem> <para> @@ -233,8 +210,7 @@ Additional information. </listitem> <listitem> <para> - Write in comment if you have tested your patch. Do not rely much on - <command>TravisCI</command>. + Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>. </para> </listitem> <listitem> @@ -244,8 +220,7 @@ Additional information. </listitem> <listitem> <para> - Notify maintainers of the package. For example add to the message: - <command>cc @jagajaga @domenkozar</command>. + Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>. </para> </listitem> </itemizedlist> @@ -257,65 +232,40 @@ Additional information. <title>Pull Request Template</title> <para> - The pull request template helps determine what steps have been made for a - contribution so far, and will help guide maintainers on the status of a - change. The motivation section of the PR should include any extra details - the title does not address and link any existing issues related to the pull - request. + The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request. </para> <para> - When a PR is created, it will be pre-populated with some checkboxes detailed - below: + When a PR is created, it will be pre-populated with some checkboxes detailed below: </para> <section xml:id="submitting-changes-tested-with-sandbox"> <title>Tested using sandboxing</title> <para> - When sandbox builds are enabled, Nix will setup an isolated environment for - each build process. It is used to remove further hidden dependencies set by - the build environment to improve reproducibility. This includes access to - the network during the build outside of <function>fetch*</function> - functions and files outside the Nix store. Depending on the operating - system access to other resources are blocked as well (ex. inter process - communication is isolated on Linux); see - <link - xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link> - in Nix manual for details. + When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of <function>fetch*</function> functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see <link + xlink:href="https://nixos.org/nix/manual/#conf-sandbox">sandbox</link> in Nix manual for details. </para> <para> - Sandboxing is not enabled by default in Nix due to a small performance hit - on each build. In pull requests for - <link - xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> - people are asked to test builds with sandboxing enabled (see - <literal>Tested using sandboxing</literal> in the pull request template) - because - in<link - xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link> - sandboxing is also used. + Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for <link + xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people are asked to test builds with sandboxing enabled (see <literal>Tested using sandboxing</literal> in the pull request template) because in<link + xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link> sandboxing is also used. </para> <para> - Depending if you use NixOS or other platforms you can use one of the - following methods to enable sandboxing - <emphasis role="bold">before</emphasis> building the package: + Depending if you use NixOS or other platforms you can use one of the following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package: <itemizedlist> <listitem> <para> - <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>: - add the following to <filename>configuration.nix</filename> + <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>: add the following to <filename>configuration.nix</filename> <screen>nix.useSandbox = true;</screen> </para> </listitem> <listitem> <para> - <emphasis role="bold">Globally enable sandboxing on non-NixOS - platforms</emphasis>: add the following to: - <filename>/etc/nix/nix.conf</filename> -<screen>build-use-sandbox = true</screen> + <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>: add the following to: <filename>/etc/nix/nix.conf</filename> +<screen>sandbox = true</screen> </para> </listitem> </itemizedlist> @@ -326,11 +276,7 @@ Additional information. <title>Built on platform(s)</title> <para> - Many Nix packages are designed to run on multiple platforms. As such, it's - important to let the maintainer know which platforms your changes have been - tested on. It's not always practical to test a change on all platforms, and - is not required for a pull request to be merged. Only check the systems you - tested the build on in this section. + Many Nix packages are designed to run on multiple platforms. As such, it's important to let the maintainer know which platforms your changes have been tested on. It's not always practical to test a change on all platforms, and is not required for a pull request to be merged. Only check the systems you tested the build on in this section. </para> </section> @@ -338,15 +284,8 @@ Additional information. <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title> <para> - Packages with automated tests are much more likely to be merged in a timely - fashion because it doesn't require as much manual testing by the maintainer - to verify the functionality of the package. If there are existing tests for - the package, they should be run to verify your changes do not break the - tests. Tests only apply to packages with NixOS modules defined and can only - be run on Linux. For more details on writing and running tests, see the - <link - xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section - in the NixOS manual</link>. + Packages with automated tests are much more likely to be merged in a timely fashion because it doesn't require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests only apply to packages with NixOS modules defined and can only be run on Linux. For more details on writing and running tests, see the <link + xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section in the NixOS manual</link>. </para> </section> @@ -354,11 +293,7 @@ Additional information. <title>Tested compilation of all pkgs that depend on this change using <command>nix-review</command></title> <para> - If you are updating a package's version, you can use nix-review to make - sure all packages that depend on the updated package still compile - correctly. The <command>nix-review</command> utility can look for and build - all dependencies either based on uncommited changes with the - <literal>wip</literal> option or specifying a github pull request number. + If you are updating a package's version, you can use nix-review to make sure all packages that depend on the updated package still compile correctly. The <command>nix-review</command> utility can look for and build all dependencies either based on uncommited changes with the <literal>wip</literal> option or specifying a github pull request number. </para> <para> @@ -376,13 +311,7 @@ Additional information. <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title> <para> - It's important to test any executables generated by a build when you change - or create a package in nixpkgs. This can be done by looking in - <filename>./result/bin</filename> and running any files in there, or at a - minimum, the main executable for the package. For example, if you make a - change to <package>texlive</package>, you probably would only check the - binaries associated with the change you made rather than testing all of - them. + It's important to test any executables generated by a build when you change or create a package in nixpkgs. This can be done by looking in <filename>./result/bin</filename> and running any files in there, or at a minimum, the main executable for the package. For example, if you make a change to <package>texlive</package>, you probably would only check the binaries associated with the change you made rather than testing all of them. </para> </section> @@ -390,14 +319,8 @@ Additional information. <title>Meets Nixpkgs contribution standards</title> <para> - The last checkbox is fits - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>. - The contributing document has detailed information on standards the Nix - community has for commit messages, reviews, licensing of contributions you - make to the project, etc... Everyone should read and understand the - standards the community has for contributing before submitting a pull - request. + The last checkbox is fits <link + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>. The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request. </para> </section> </section> @@ -435,22 +358,17 @@ Additional information. <itemizedlist> <listitem> <para> - Commits must be sufficiently tested before being merged, both for the - master and staging branches. + Commits must be sufficiently tested before being merged, both for the master and staging branches. </para> </listitem> <listitem> <para> - Hydra builds for master and staging should not be used as testing - platform, it's a build farm for changes that have been already tested. + Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested. </para> </listitem> <listitem> <para> - When changing the bootloader installation process, extra care must be - taken. Grub installations cannot be rolled back, hence changes may break - people's installations forever. For any non-trivial change to the - bootloader please file a PR asking for review, especially from @edolstra. + When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra. </para> </listitem> </itemizedlist> @@ -473,20 +391,12 @@ Additional information. <itemizedlist> <listitem> <para> - It's only for non-breaking mass-rebuild commits. That means it's not to - be used for testing, and changes must have been well tested already. - <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read - policy here</link>. + It's only for non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>. </para> </listitem> <listitem> <para> - If the branch is already in a broken state, please refrain from adding - extra new breakages. Stabilize it for a few days, merge into master, then - resume development on staging. - <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep - an eye on the staging evaluations here</link>. If any fixes for staging - happen to be already in master, then master can be merged into staging. + If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. If any fixes for staging happen to be already in master, then master can be merged into staging. </para> </listitem> </itemizedlist> @@ -498,10 +408,7 @@ Additional information. <itemizedlist> <listitem> <para> - If you're cherry-picking a commit to a stable release branch, always use - <command>git cherry-pick -xe</command> and ensure the message contains a - clear description about why this needs to be included in the stable - branch. + If you're cherry-picking a commit to a stable release branch, always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch. </para> <para> An example of a cherry-picked commit would look like this: diff --git a/lib/licenses.nix b/lib/licenses.nix index 83e1ec7748d..986b7fa1fdd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -218,9 +218,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Common Public License 1.0"; }; - curl = { - fullName = "MIT/X11 derivate"; - url = "https://curl.haxx.se/docs/copyright.html"; + curl = spdx { + spdxId = "curl"; + fullName = "curl License"; }; doc = spdx { @@ -613,6 +613,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = https://enterprise.dejacode.com/licenses/public/purdue-bsd; }; + qhull = spdx { + spdxId = "Qhull"; + fullName = "Qhull License"; + }; + qpl = spdx { spdxId = "QPL-1.0"; fullName = "Q Public License 1.0"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 058561eb624..3cb0cd3fa99 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -693,7 +693,7 @@ name = "Aycan iRiCAN"; }; babariviere = { - email = "babariviere@protonmail.com"; + email = "babathriviere@gmail.com"; github = "babariviere"; githubId = 12128029; name = "babariviere"; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 58ab7207f53..e4dcc90cdd3 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -484,6 +484,35 @@ (<literal>citrix_workspace</literal>). </para> </listitem> + <listitem> + <para> + The <literal>services.gitlab</literal> module has had its literal secret options (<option>services.gitlab.smtp.password</option>, + <option>services.gitlab.databasePassword</option>, + <option>services.gitlab.initialRootPassword</option>, + <option>services.gitlab.secrets.secret</option>, + <option>services.gitlab.secrets.db</option>, + <option>services.gitlab.secrets.otp</option> and + <option>services.gitlab.secrets.jws</option>) replaced by file-based versions (<option>services.gitlab.smtp.passwordFile</option>, + <option>services.gitlab.databasePasswordFile</option>, + <option>services.gitlab.initialRootPasswordFile</option>, + <option>services.gitlab.secrets.secretFile</option>, + <option>services.gitlab.secrets.dbFile</option>, + <option>services.gitlab.secrets.otpFile</option> and + <option>services.gitlab.secrets.jwsFile</option>). This was done so that secrets aren't stored + in the world-readable nix store, but means that for each option you'll have to create a file with + the same exact string, add "File" to the end of the option name, and change the definition to a + string pointing to the corresponding file; e.g. <literal>services.gitlab.databasePassword = "supersecurepassword"</literal> + becomes <literal>services.gitlab.databasePasswordFile = "/path/to/secret_file"</literal> where the + file <literal>secret_file</literal> contains the string <literal>supersecurepassword</literal>. + </para> + <para> + The state path (<option>services.gitlab.statePath</option>) now has the following restriction: + no parent directory can be owned by any other user than <literal>root</literal> or the user + specified in <option>services.gitlab.user</option>; i.e. if <option>services.gitlab.statePath</option> + is set to <literal>/var/lib/gitlab/state</literal>, <literal>gitlab</literal> and all parent directories + must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf index 4a565c8465b..c3f39c7fd81 100644 --- a/nixos/doc/xmlformat.conf +++ b/nixos/doc/xmlformat.conf @@ -37,7 +37,6 @@ para abstract entry-break 1 exit-break 1 normalize yes - wrap-length 79 title format block diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9dfc1add829..d939cbb393e 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -157,6 +157,8 @@ in # terminal instead of logging out of X11). environment.variables = config.environment.sessionVariables; + environment.profileRelativeEnvVars = config.environment.profileRelativeSessionVariables; + environment.shellAliases = mapAttrs (name: mkDefault) { ls = "ls --color=tty"; ll = "ls -l"; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 6011e354ece..792d1dbb38f 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -8,6 +8,11 @@ let cfg = config.environment; + pamProfiles = + map + (replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]) + cfg.profiles; + in { @@ -18,25 +23,76 @@ in default = {}; description = '' A set of environment variables used in the global environment. - These variables will be set by PAM. - The value of each variable can be either a string or a list of - strings. The latter is concatenated, interspersed with colon - characters. + These variables will be set by PAM early in the login process. + + The value of each session variable can be either a string or a + list of strings. The latter is concatenated, interspersed with + colon characters. + + Note, due to limitations in the PAM format values may not + contain the <literal>"</literal> character. + + Also, these variables are merged into + <xref linkend="opt-environment.variables"/> and it is + therefore not possible to use PAM style variables such as + <code>@{HOME}</code>. ''; type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; + environment.profileRelativeSessionVariables = mkOption { + type = types.attrsOf (types.listOf types.str); + example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; }; + description = '' + Attribute set of environment variable used in the global + environment. These variables will be set by PAM early in the + login process. + + Variable substitution is available as described in + <citerefentry> + <refentrytitle>pam_env.conf</refentrytitle> + <manvolnum>5</manvolnum> + </citerefentry>. + + Each attribute maps to a list of relative paths. Each relative + path is appended to the each profile of + <option>environment.profiles</option> to form the content of + the corresponding environment variable. + + Also, these variables are merged into + <xref linkend="opt-environment.profileRelativeEnvVars"/> and it is + therefore not possible to use PAM style variables such as + <code>@{HOME}</code>. + ''; + }; + }; config = { - system.build.pamEnvironment = pkgs.writeText "pam-environment" - '' - ${concatStringsSep "\n" ( - (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') - (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))} - ''; + system.build.pamEnvironment = + let + suffixedVariables = + flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: + flip concatMap pamProfiles (profile: + map (suffix: "${profile}${suffix}") suffixes + ) + ); + + pamVariable = n: v: + ''${n} DEFAULT="${concatStringsSep ":" (toList v)}"''; + + pamVariables = + concatStringsSep "\n" + (mapAttrsToList pamVariable + (zipAttrsWith (n: concatLists) + [ + (mapAttrs (n: toList) cfg.sessionVariables) + suffixedVariables + ])); + in + pkgs.writeText "pam-environment" "${pamVariables}\n"; }; diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index b86ce2dbf05..1396640af67 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -12,7 +12,7 @@ source = "${config.system.path}/share/terminfo"; }; - environment.profileRelativeEnvVars = { + environment.profileRelativeSessionVariables = { TERMINFO_DIRS = [ "/share/terminfo" ]; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 8268a3771a0..4677ce090b0 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -7,21 +7,32 @@ with lib; type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the <link xlink:href="https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html">XDG Icon Theme specification</link>. ''; }; }; config = mkIf config.xdg.icons.enable { - environment.pathsToLink = [ - "/share/icons" - "/share/pixmaps" + environment.pathsToLink = [ + "/share/icons" + "/share/pixmaps" + ]; + + # libXcursor looks for cursors in XCURSOR_PATH + # it mostly follows the spec for icons + # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes + + # These are preferred so they come first in the list + environment.sessionVariables.XCURSOR_PATH = [ + "$HOME/.icons" + "$HOME/.local/share/icons" + ]; + + environment.profileRelativeSessionVariables.XCURSOR_PATH = [ + "/share/icons" + "/share/pixmaps" ]; - - environment.profileRelativeEnvVars = { - XCURSOR_PATH = [ "/share/icons" ]; - }; }; } diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 0a015044155..a2a8e8ef752 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -174,8 +174,10 @@ in boot.postBootCommands = '' # On the first boot do some maintenance tasks if [ -f /nix-path-registration ]; then + set -euo pipefail + set -x # Figure out device names for the boot device and root filesystem. - rootPart=$(readlink -f /dev/disk/by-label/NIXOS_SD) + rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /) bootDevice=$(lsblk -npo PKNAME $rootPart) # Resize the root partition and the filesystem to fit the disk diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fb8453f1d53..775cc05aa0a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -938,6 +938,7 @@ ./virtualisation/anbox.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix + ./virtualisation/cri-o.nix ./virtualisation/docker.nix ./virtualisation/docker-containers.nix ./virtualisation/ecs-agent.nix diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 315d04093b1..0ea70107f71 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ ... }: +{ lib, ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; @@ -15,5 +15,5 @@ hwclock -s ''; - security.rngd.enable = false; + security.rngd.enable = lib.mkDefault false; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 66eb8348266..fcffb213498 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -20,8 +20,9 @@ in { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; - XCURSOR_PATH = [ "$HOME/.icons" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc + GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes + GTK_EXE_PREFIX = "${config.system.path}"; }; environment.profiles = mkAfter @@ -30,7 +31,7 @@ in ]; # TODO: move most of these elsewhere - environment.profileRelativeEnvVars = + environment.profileRelativeSessionVariables = { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; KDEDIRS = [ "" ]; diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index e19935b77ca..75b3e707d57 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -54,8 +54,8 @@ in type = types.attrsOf types.str; default = {}; example = { - h = "noaction 5\e("; - l = "noaction 5\e)"; + h = "noaction 5\\e("; + l = "noaction 5\\e)"; }; description = "Defines new command keys."; }; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index b4f03151cdc..f92d09a7ef4 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -55,7 +55,7 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ - swaylock swayidle + swaylock swayidle swaybg xwayland rxvt_unicode dmenu ]; defaultText = literalExample '' diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 9c7ddc2f4ee..11227354ad3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -351,7 +351,7 @@ let ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth - "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so id=${toString yubi.id} ${optionalString yubi.debug "debug"}"} + "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run @@ -415,7 +415,7 @@ let # Session management. ${optionalString cfg.setEnvironment '' - session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 ''} session required pam_unix.so ${optionalString cfg.setLoginUid @@ -696,6 +696,23 @@ in Debug output to stderr. ''; }; + mode = mkOption { + default = "client"; + type = types.enum [ "client" "challenge-response" ]; + description = '' + Mode of operation. + + Use "client" for online validation with a YubiKey validation service such as + the YubiCloud. + + Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1 + Challenge-Response configurations. See the man-page ykpamcfg(1) for further + details on how to configure offline Challenge-Response validation. + + More information can be found <link + xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>. + ''; + }; }; security.pam.enableEcryptfs = mkOption { @@ -742,13 +759,6 @@ in environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; - systemd.tmpfiles.rules = optionals - (any (s: s.updateWtmp) (attrValues config.security.pam.services)) - [ - "f /var/log/wtmp" - "f /var/log/lastlog" - ]; - security.pam.services = { other.text = '' diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index e3556b2559c..4b74e753279 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -28,7 +28,7 @@ in after = [ "network-online.target" "sound.target" ]; description = "spotifyd, a Spotify playing daemon"; serviceConfig = { - ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}"; + ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}"; Restart = "always"; RestartSec = 12; DynamicUser = true; diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix index d9a37037992..3d9869d5343 100644 --- a/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -169,13 +169,14 @@ in { systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" { description = "PostgreSQL WAL receiver (${name})"; wantedBy = [ "multi-user.target" ]; + startLimitIntervalSec = 0; # retry forever, useful in case of network disruption serviceConfig = { User = "postgres"; Group = "postgres"; KillSignal = "SIGINT"; Restart = "always"; - RestartSec = 30; + RestartSec = 60; }; inherit (config) environment; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index ba7ec967919..d791b387665 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -95,13 +95,7 @@ in { environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; - environment.variables = { - # This is required so that GTK applications launched from Emacs - # get properly themed: - GTK_DATA_PREFIX = "${config.system.path}"; - } // (if cfg.defaultEditor then { - EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor"; - } else {}); + environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); }; meta.doc = ./emacs.xml; diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix index fa8d41e918d..f5b4508b335 100644 --- a/nixos/modules/services/mail/mailcatcher.nix +++ b/nixos/modules/services/mail/mailcatcher.nix @@ -3,7 +3,7 @@ let cfg = config.services.mailcatcher; - inherit (lib) mkEnableOption mkIf mkOption types; + inherit (lib) mkEnableOption mkIf mkOption types optionalString; in { # interface @@ -54,6 +54,7 @@ in DynamicUser = true; Restart = "always"; ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}"; + AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service"; }; }; }; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 89aa9d17ff7..4db35d9e89a 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -68,7 +68,7 @@ let replaced with <literal>rspamd_proxy</literal>. ''; apply = let - from = "services.rspamd.workers.\”${name}\".type"; + from = "services.rspamd.workers.\"${name}\".type"; files = options.type.files; warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`"; in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 59c1c104b9b..4992b13c9d4 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -322,6 +322,7 @@ in "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -" + "d '${cfg.stateDir}/log' - ${cfg.user} gitea - -" "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" "Z '${cfg.stateDir}' - ${cfg.user} gitea - -" diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 66da6864fca..4c1ffead00c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -223,7 +223,15 @@ in { statePath = mkOption { type = types.str; default = "/var/gitlab/state"; - description = "Gitlab state directory, logs are stored here."; + description = '' + Gitlab state directory. Configuration, repositories and + logs, among other things, are stored here. + + The directory will be created automatically if it doesn't + exist already. Its parent directories must be owned by + either <literal>root</literal> or the user set in + <option>services.gitlab.user</option>. + ''; }; backupPath = mkOption { @@ -673,6 +681,10 @@ in { openssh nodejs gnupg + + # Needed for GitLab project imports + gnutar + gzip ]; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 64cb6c3da1e..f7874af3df2 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -239,7 +239,7 @@ in { description = "Any metrics received which match one of the experssions will be dropped."; default = null; type = types.nullOr types.str; - example = "^some\.noisy\.metric\.prefix\..*"; + example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; whitelist = mkOption { diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix index 85e804d6cf2..152cceb4bf9 100644 --- a/nixos/modules/services/networking/jormungandr.nix +++ b/nixos/modules/services/networking/jormungandr.nix @@ -14,8 +14,10 @@ let storage = dataDir; p2p = { public_address = "/ip4/127.0.0.1/tcp/8299"; - messages = "high"; - blocks = "high"; + topics_of_interest = { + messages = "high"; + blocks = "high"; + }; }; rest = { listen = "127.0.0.1:8607"; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index db4d0e328e2..887c89ddf3a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -27,6 +27,7 @@ let [logging] level=${cfg.logLevel} + audit=${lib.boolToString config.security.audit.enable} [connection] ipv6.ip6-privacy=2 @@ -508,8 +509,9 @@ in { security.polkit.extraConfig = polkitConf; - services.dbus.packages = - optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages; + services.dbus.packages = cfg.packages + ++ optional cfg.enableStrongSwan pkgs.strongswanNM + ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq; services.udev.packages = cfg.packages; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1ae063aa6bb..7a503e71166 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -465,7 +465,7 @@ in modules_enabled = { - ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList + ${ lib.concatStringsSep "\n " (lib.mapAttrsToList (name: val: optionalString val "${toLua name};") cfg.modules) } ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)} diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index d9f840408cc..1e34aff8d17 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -105,8 +105,8 @@ in { default = null; example = { serverAliases = [ - "matomo.$\{config.networking.domain\}" - "stats.$\{config.networking.domain\}" + "matomo.\${config.networking.domain}" + "stats.\${config.networking.domain}" ]; enableACME = false; }; @@ -115,7 +115,7 @@ in { Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the <option>serverName</option> is - <literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>, + <literal>''${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>, SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; @@ -275,7 +275,7 @@ in { fastcgi_pass unix:${phpSocket}; ''; # Any other attempt to access any php files is forbidden - locations."~* ^.+\.php$".extraConfig = '' + locations."~* ^.+\\.php$".extraConfig = '' return 403; ''; # Disallow access to unneeded directories @@ -284,7 +284,7 @@ in { return 403; ''; # Disallow access to several helper files - locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' + locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' return 403; ''; # No crawling of this site for bots that obey robots.txt - no useful information here. diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 1e7882488ac..2c2f36ac598 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -235,7 +235,7 @@ in locations."/".root = "${runDir}/client"; - locations."~ \.php$" = { + locations."~ \\.php$" = { tryFiles = "$uri =404"; extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; @@ -246,7 +246,7 @@ in ''; }; - locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { + locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { root = "${runDir}/client"; extraConfig = '' if (-f $request_filename) { diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index abe4748591e..b92e3449894 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -548,7 +548,7 @@ let index = "index.php"; }; - locations."~ \.php$" = { + locations."~ \\.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 88475437058..e311dd917dd 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -61,6 +61,19 @@ let ?> ''; + secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ]; + secretsScript = hostStateDir: '' + if ! test -e "${hostStateDir}/secret-keys.php"; then + umask 0177 + echo "<?php" >> "${hostStateDir}/secret-keys.php" + ${concatMapStringsSep "\n" (var: '' + echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php" + '') secretsVars} + echo "?>" >> "${hostStateDir}/secret-keys.php" + chmod 440 "${hostStateDir}/secret-keys.php" + fi + ''; + siteOpts = { lib, name, ... }: { options = { @@ -340,14 +353,7 @@ in wantedBy = [ "multi-user.target" ]; before = [ "phpfpm-wordpress-${hostName}.service" ]; after = optional cfg.database.createLocally "mysql.service"; - script = '' - if ! test -e "${stateDir hostName}/secret-keys.php"; then - echo "<?php" >> "${stateDir hostName}/secret-keys.php" - ${pkgs.curl}/bin/curl -s https://api.wordpress.org/secret-key/1.1/salt/ >> "${stateDir hostName}/secret-keys.php" - echo "?>" >> "${stateDir hostName}/secret-keys.php" - chmod 440 "${stateDir hostName}/secret-keys.php" - fi - ''; + script = secretsScript (stateDir hostName); serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 9914b668709..3745069f6ea 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -48,10 +48,6 @@ in services.xserver.desktopManager.session = [ { name = "Enlightenment"; start = '' - # Set GTK_DATA_PREFIX so that GTK can find the themes - export GTK_DATA_PREFIX=${config.system.path} - # find theme engines - export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 export XDG_MENU_PREFIX=e- export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}" diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index d7a871c9c70..4563583e070 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -48,12 +48,6 @@ in name = "mate"; bgSupport = true; start = '' - # Set GTK_DATA_PREFIX so that GTK can find the themes - export GTK_DATA_PREFIX=${config.system.path} - - # Find theme engines - export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=mate- # Let caja find extensions diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e313a194c34..d80ea9a53e8 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -79,8 +79,7 @@ in Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. ''; - services.xserver.displayManager.lightdm.enable = mkDefault true; - services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true; + services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; # If not set manually Pantheon session cannot be started # Known issue of https://github.com/NixOS/nixpkgs/pull/43992 @@ -98,10 +97,6 @@ in export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib fi '') cfg.sessionPath} - - # Settings from elementary-default-settings - export GTK_CSD=1 - export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module fi ''; @@ -166,9 +161,14 @@ in networkmanager-iodine networkmanager-l2tp; }; # Override GSettings schemas - environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + + environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; - environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; + # Settings from elementary-default-settings + environment.sessionVariables.GTK_CSD = "1"; + environment.sessionVariables.GTK_MODULES = "pantheon-filechooser-module"; + environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index e3249aef50c..6965c6d2646 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -107,12 +107,6 @@ in start = '' ${cfg.extraSessionCommands} - # Set GTK_PATH so that GTK can find the theme engines. - export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - - # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. - export GTK_DATA_PREFIX=${config.system.path} - ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} & waitPID=$! ''; diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 57d1268d655..130e865a1fb 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -53,6 +53,7 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache + gnome3.gnome-themes-extra gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme @@ -69,16 +70,17 @@ in exo garcon - gtk-xfce-engine libxfce4ui xfconf mousepad + parole ristretto xfce4-appfinder xfce4-screenshooter xfce4-session xfce4-settings + xfce4-taskmanager xfce4-terminal # TODO: resync patch for plugins @@ -86,12 +88,16 @@ in thunar ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin ++ optional config.powerManagement.enable xfce4-power-manager - ++ optional cfg.enableXfwm xfwm4 - ++ optionals (!cfg.noDesktop) [ - xfce4-panel + ++ optionals config.hardware.pulseaudio.enable [ + pavucontrol + xfce4-pulseaudio-plugin + ] ++ optionals cfg.enableXfwm [ + xfwm4 + xfwm4-themes + ] ++ optionals (!cfg.noDesktop) [ xfce4-notifyd + xfce4-panel xfdesktop ]; @@ -114,12 +120,6 @@ in name = "xfce4-14"; bgSupport = true; start = '' - # Set GTK_PATH so that GTK can find the theme engines. - export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - - # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. - export GTK_DATA_PREFIX=${config.system.path} - ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} & waitPID=$! ''; diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 1408df31295..f76db278a92 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.xserver.desktopManager.xterm; + xSessionEnabled = config.services.xserver.enable; in @@ -13,7 +14,8 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = (versionOlder config.system.stateVersion "19.09"); + default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled; + defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false"; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 3f1669d0851..0a5d52e319e 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -142,8 +142,6 @@ in GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); XDG_DATA_DIRS = "${cfg.session.desktops}/share/"; - # Find the mouse - XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons"; } // optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the # configured setupCommands. This relies on a patched GDM which supports @@ -262,7 +260,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = gdm - session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index de128809ce3..129df139c61 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -10,32 +10,6 @@ let icons = cfg.iconTheme.package; cursors = cfg.cursorTheme.package; - # We need a few things in the environment for the greeter to run with - # fonts/icons. - wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" { - buildInputs = [ pkgs.makeWrapper ]; - preferLocalBuild = true; - } '' - # This wrapper ensures that we actually get themes - makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \ - $out/greeter \ - --prefix PATH : "${pkgs.glibc.bin}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ - --set GTK_EXE_PREFIX "${theme}" \ - --set GTK_DATA_PREFIX "${theme}" \ - --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \ - --set XDG_CONFIG_HOME "${theme}/share" - - cat - > $out/lightdm-enso-os-greeter.desktop << EOF - [Desktop Entry] - Name=LightDM Greeter - Comment=This runs the LightDM Greeter - Exec=$out/greeter - Type=Application - EOF - ''; - ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" '' [greeter] default-wallpaper=${ldmcfg.background} @@ -144,10 +118,16 @@ in { config = mkIf (ldmcfg.enable && cfg.enable) { environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; + environment.systemPackages = [ + cursors + icons + theme + ]; + services.xserver.displayManager.lightdm = { greeter = mkDefault { - package = wrappedEnsoGreeter; - name = "lightdm-enso-os-greeter"; + package = pkgs.lightdm-enso-os-greeter.xgreeters; + name = "pantheon-greeter"; }; greeters = { diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 5b280b02423..de932e6e840 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -15,34 +15,6 @@ let icons = cfg.iconTheme.package; cursors = cfg.cursorTheme.package; - # The default greeter provided with this expression is the GTK greeter. - # Again, we need a few things in the environment for the greeter to run with - # fonts/icons. - wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" { - buildInputs = [ pkgs.makeWrapper ]; - preferLocalBuild = true; - } '' - # This wrapper ensures that we actually get themes - makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ - $out/greeter \ - --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ - --set GTK_EXE_PREFIX "${theme}" \ - --set GTK_DATA_PREFIX "${theme}" \ - --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ - --set XDG_CONFIG_HOME "${theme}/share" \ - --set XCURSOR_PATH "${cursors}/share/icons" - - cat - > $out/lightdm-gtk-greeter.desktop << EOF - [Desktop Entry] - Name=LightDM Greeter - Comment=This runs the LightDM Greeter - Exec=$out/greeter - Type=Application - EOF - ''; - gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" '' [greeter] @@ -185,10 +157,16 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeter = mkDefault { - package = wrappedGtkGreeter; + package = pkgs.lightdm_gtk_greeter.xgreeters; name = "lightdm-gtk-greeter"; }; + environment.systemPackages = [ + cursors + icons + theme + ]; + environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix index ba8151a60f2..fa9445af32e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -8,11 +8,6 @@ let ldmcfg = dmcfg.lightdm; cfg = ldmcfg.greeters.mini; - xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{ - path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; - name = "lightdm-mini-greeter.desktop"; - }]; - miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf" '' [greeter] @@ -90,7 +85,7 @@ in services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { - package = xgreeters; + package = pkgs.lightdm-mini-greeter.xgreeters; name = "lightdm-mini-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index bfba174144a..29cb6ccbc06 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -8,11 +8,6 @@ let ldmcfg = dmcfg.lightdm; cfg = ldmcfg.greeters.pantheon; - xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{ - path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; - name = "io.elementary.greeter.desktop"; - }]; - in { options = { @@ -33,17 +28,10 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { - warnings = [ - '' - The Pantheon greeter is suboptimal in NixOS and can possibly put you in - a situation where you cannot start a session when switching desktopManagers. - '' - ]; - services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { - package = xgreeters; + package = pkgs.pantheon.elementary-greeter.xgreeters; name = "io.elementary.greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index c26a5b61535..f105cb496e6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -249,7 +249,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = lightdm - session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index c6cb281c2cc..8847acb0c60 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -219,8 +219,6 @@ in # Load themes from system environment QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix; QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix; - - XDG_DATA_DIRS = "/run/current-system/sw/share"; }; execCmd = "exec /run/current-system/sw/bin/sddm"; @@ -242,7 +240,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = sddm - session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 8ff00fa11dc..641cf9faadc 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -10,6 +10,9 @@ use Cwd 'abs_path'; my $out = "@out@"; +# FIXME: maybe we should use /proc/1/exe to get the current systemd. +my $curSystemd = abs_path("/run/current-system/sw/bin"); + # To be robust against interruption, record what units need to be started etc. my $startListFile = "/run/systemd/start-list"; my $restartListFile = "/run/systemd/restart-list"; @@ -267,7 +270,7 @@ while (my ($unit, $state) = each %{$activePrev}) { sub pathToUnitName { my ($path) = @_; # Use current version of systemctl binary before daemon is reexeced. - open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path + open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path or die "Unable to escape $path!\n"; my $escaped = join "", <$cmd>; chomp $escaped; @@ -370,7 +373,7 @@ if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; # Use current version of systemctl binary before daemon is reexeced. - system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" @@ -382,10 +385,12 @@ my $res = 0; print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; -# Restart systemd if necessary. +# Restart systemd if necessary. Note that this is done using the +# current version of systemd, just in case the new one has trouble +# communicating with the running pid 1. if ($restartSystemd) { print STDERR "restarting systemd...\n"; - system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2; + system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2; } # Forget about previously failed services. @@ -401,8 +406,10 @@ while (my $f = <$listActiveUsers>) { my ($uid, $name) = ($+{uid}, $+{user}); print STDERR "reloading user units for $name...\n"; - system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); - system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service"); + system("@su@", "-s", "@shell@", "-l", $name, "-c", + "export XDG_RUNTIME_DIR=/run/user/$uid; " . + "$curSystemd/systemctl --user daemon-reexec; " . + "@systemd@/bin/systemctl --user start nixos-activation.service"); } close $listActiveUsers; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 50dbf2f8365..8a309f3bc5f 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -108,7 +108,7 @@ in boot.extraModulePackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]"; + example = literalExample "[ config.boot.kernelPackages.nvidia_x11 ]"; description = "A list of additional packages supplying kernel modules."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2287a82418f..5cf437bfbcb 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -858,7 +858,12 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf"; + "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"; "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; + "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf"; + "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf"; + "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; "tmpfiles.d/nixos.conf".text = '' diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 34e27066715..7c6604922cf 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -12,7 +12,7 @@ let i.ipv4.addresses ++ optionals cfg.enableIPv6 i.ipv6.addresses; - dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no"; + dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no"; slaves = concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds)) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix new file mode 100644 index 00000000000..14a435f6c8b --- /dev/null +++ b/nixos/modules/virtualisation/cri-o.nix @@ -0,0 +1,106 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.cri-o; +in +{ + options.virtualisation.cri-o = { + enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)"; + + storageDriver = mkOption { + type = types.enum ["btrfs" "overlay" "vfs"]; + default = "overlay"; + description = "Storage driver to be used"; + }; + + logLevel = mkOption { + type = types.enum ["trace" "debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = "Log level to be used"; + }; + + pauseImage = mkOption { + type = types.str; + default = "k8s.gcr.io/pause:3.1"; + description = "Pause image for pod sandboxes to be used"; + }; + + pauseCommand = mkOption { + type = types.str; + default = "/pause"; + description = "Pause command to be executed"; + }; + + registries = mkOption { + type = types.listOf types.str; + default = [ "docker.io" "quay.io" ]; + description = "Registries to be configured for unqualified image pull"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; + [ cri-o cri-tools conmon cni-plugins iptables runc utillinux ]; + environment.etc."crictl.yaml".text = '' + runtime-endpoint: unix:///var/run/crio/crio.sock + ''; + environment.etc."crio/crio.conf".text = '' + [crio] + storage_driver = "${cfg.storageDriver}" + + [crio.image] + pause_image = "${cfg.pauseImage}" + pause_command = "${cfg.pauseCommand}" + registries = [ + ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} + ] + + [crio.runtime] + conmon = "${pkgs.conmon}/bin/conmon" + log_level = "${cfg.logLevel}" + manage_network_ns_lifecycle = true + ''; + environment.etc."containers/policy.json".text = '' + {"default": [{"type": "insecureAcceptAnything"}]} + ''; + environment.etc."cni/net.d/20-cri-o-bridge.conf".text = '' + { + "cniVersion": "0.3.1", + "name": "crio-bridge", + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "ipam": { + "type": "host-local", + "subnet": "10.88.0.0/16", + "routes": [ + { "dst": "0.0.0.0/0" } + ] + } + } + ''; + + systemd.services.crio = { + description = "Container Runtime Interface for OCI (CRI-O)"; + documentation = [ "https://github.com/cri-o/cri-o" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = [ pkgs.utillinux pkgs.runc pkgs.iptables ]; + serviceConfig = { + Type = "notify"; + ExecStart = "${pkgs.cri-o}/bin/crio"; + ExecReload = "/bin/kill -s HUP $MAINPID"; + TasksMax = "infinity"; + LimitNOFILE = "1048576"; + LimitNPROC = "1048576"; + LimitCORE = "infinity"; + OOMScoreAdjust = "-999"; + TimeoutStartSec = "0"; + Restart = "on-abnormal"; + }; + }; + }; +} diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 90f9793b370..cbf76f9e558 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -10,6 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : { { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; + environment.memoryAllocator.provider = "graphene-hardened"; nix.useSandbox = false; virtualisation.emptyDiskImages = [ 4096 ]; boot.initrd.postDeviceCommands = '' diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 774ef6293b5..c6acfa6c1f3 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -20,12 +20,6 @@ import ./make-test.nix ({ pkgs, ... }: }; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; - - # required for wordpress-init.service to succeed - systemd.tmpfiles.rules = [ - "F /var/lib/wordpress/site1.local/secret-keys.php 0440 wordpress wwwrun - -" - "F /var/lib/wordpress/site2.local/secret-keys.php 0440 wordpress wwwrun - -" - ]; }; testScript = '' @@ -37,6 +31,11 @@ import ./make-test.nix ({ pkgs, ... }: $machine->succeed("curl -L site1.local | grep 'Welcome to the famous'"); $machine->succeed("curl -L site2.local | grep 'Welcome to the famous'"); + + $machine->succeed("systemctl --no-pager show wordpress-init-site1.local.service | grep 'ExecStart=.*status=0'"); + $machine->succeed("systemctl --no-pager show wordpress-init-site2.local.service | grep 'ExecStart=.*status=0'"); + $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site1.local/secret-keys.php"); + $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site2.local/secret-keys.php"); ''; }) diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index d8fada45eb1..b8ec2d7116f 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -4,15 +4,13 @@ stdenv.mkDerivation rec { pname = "gigedit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; + sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb"; }; - patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; - preConfigure = "make -f Makefile.svn"; nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch deleted file mode 100644 index eb00fcc87a2..00000000000 --- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/gigedit/wrapLabel.cc -+++ b/src/gigedit/wrapLabel.cc -@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text - : mWrapWidth(0), - mWrapHeight(0) - { -- // pangomm >= 2.35.1 --#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) -- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); --#else - get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); --#endif - set_alignment(0.0, 0.0); - set_text(text); - } diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index c574c862f52..a5248e2a89e 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests + gst-python pygobject3 pykka tornado_4 requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3a663fd33c8..90b81e1163d 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.39.0"; + version = "3.40.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag"; + sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix new file mode 100644 index 00000000000..7e49b872a6a --- /dev/null +++ b/pkgs/applications/audio/osmid/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, alsaLib +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "osmid"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "llloret"; + repo = "osmid"; + rev = "v${version}"; + sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ alsaLib libX11 ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp {m2o,o2m} $out/bin/ + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/llloret/osmid"; + description = "A lightweight, portable, easy to use tool to convert MIDI to OSC and OSC to MIDI"; + license = licenses.mit; + maintainers = with maintainers; [ c0deaddict ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 9035a2a73c5..7734a7f3067 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.11"; + version = "0.2.14"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = version; - sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; + rev = "v${version}"; + sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz"; }; - cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3"; + cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4"; cargoBuildFlags = [ "--no-default-features" @@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optional withPulseAudio libpulseaudio ++ stdenv.lib.optional withPortAudio portaudio; + doCheck = false; + meta = with stdenv.lib; { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index 8c276d6bb80..bde73ec16c8 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.3.3"; + version = "0.5.0"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j"; + sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6"; fetchSubmodules = true; }; - cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal"; + cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { install -d $out/bin $out/templates install -m755 target/*/release/jormungandr $out/bin/ install -m755 target/*/release/jcli $out/bin/ + install -m755 target/*/release/jormungandr-scenario-tests $out/bin/ install -m755 scripts/send-transaction $out/templates install -m755 scripts/jcli-helpers $out/bin/ install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index accdea3ae2d..3128f125cd9 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pkgconfig +{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs -, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: +, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { version = "0.2.1"; @@ -12,12 +12,21 @@ stdenv.mkDerivation { sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; }; + patches = [ + ./fix-paths.patch + ]; + + nativeBuildInputs = [ + cmake + pkgconfig + vala + wrapGAppsHook + ]; + buildInputs = [ dbus gtk3 pcre - vala - cmake epoxy libgee libX11 @@ -29,31 +38,21 @@ stdenv.mkDerivation { at-spi2-core libxkbcommon libpthreadstubs + librsvg ]; - nativeBuildInputs = [ - pkgconfig - ]; - - postPatch = '' - sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt - ''; - preConfigure = '' cd greeter ''; - installFlags = [ - "DESTDIR=$(out)" - ]; - - preFixup = '' - mv $out/usr/* $out - rm -r $out/usr - ''; + passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [{ + path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop"; + name = "pantheon-greeter.desktop"; + }]; postFixup = '' - rm -r $out/sbin + substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \ + --replace "pantheon-greeter" "$out/bin/pantheon-greeter" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch new file mode 100644 index 00000000000..ab3ad2b10e4 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch @@ -0,0 +1,24 @@ +diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt +index 57aebb0..ab50bff 100644 +--- a/greeter/CMakeLists.txt ++++ b/greeter/CMakeLists.txt +@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + set (CONF_DIR "/etc/lightdm") + set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set (PKGDATADIR "${DATADIR}/enso/greeter") +-set (CMAKE_INSTALL_PREFIX /usr) + set (VERSION "1.0.6") + + +@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml) + add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS}) + target_link_libraries(pantheon-greeter m) + +-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin) ++install (TARGETS pantheon-greeter RUNTIME DESTINATION bin) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters) +-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR}) ++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR}) diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 69635718e3b..b5b26d7cc43 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: +{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,17 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ lightdm gtk3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ "configdir=$(out)/etc" ]; + makeFlags = [ "configdir=${placeholder "out"}/etc" ]; postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + meta = with stdenv.lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; homepage = https://github.com/prikhi/lightdm-mini-greeter; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index f892a9da50b..5b1490a6b3b 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,7 +1,18 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor-icon-theme, makeWrapper -, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -, exo, at-spi2-core +{ stdenv +, lightdm_gtk_greeter +, fetchurl +, lightdm +, pkgconfig +, intltool +, linkFarm +, wrapGAppsHook +, useGTK2 ? false +, gtk2 +, gtk3 # gtk3 seems better supported +, exo +, at-spi2-core +, librsvg +, hicolor-icon-theme }: #ToDo: bad icons with gtk2; @@ -20,14 +31,15 @@ stdenv.mkDerivation rec { sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" + "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; preConfigure = '' @@ -43,11 +55,14 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ + path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; + name = "lightdm-gtk-greeter.desktop"; + }]; + meta = with stdenv.lib; { homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2a9129cfebf..b059747e052 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.11"; # "Android Studio 3.6 Canary 11" - build = "192.5863777"; - sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8"; + version = "3.6.0.12"; # "Android Studio 3.6 Canary 12" + build = "192.5871855"; + sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7737034973a..9e5324b1041 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -636,16 +636,16 @@ license = lib.licenses.free; }; }) {}; - csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: + csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.7.el"; - sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6"; + url = "https://elpa.gnu.org/packages/csv-mode-1.8.el"; + sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/csv-mode.html"; license = lib.licenses.free; @@ -975,10 +975,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20190517"; + version = "20190902"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20190517.tar"; - sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07"; + url = "https://elpa.gnu.org/packages/eev-20190902.tar"; + sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69"; }; packageRequires = [ emacs ]; meta = { @@ -1132,10 +1132,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.22.1"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar"; - sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4"; + url = "https://elpa.gnu.org/packages/exwm-0.23.tar"; + sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"; }; packageRequires = [ xelb ]; meta = { @@ -1282,10 +1282,10 @@ elpaBuild { pname = "gited"; ename = "gited"; - version = "0.5.4"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.5.4.tar"; - sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12"; + url = "https://elpa.gnu.org/packages/gited-0.6.0.tar"; + sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1327,10 +1327,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar"; - sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar"; + sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd"; }; packageRequires = [ cl-lib ]; meta = { @@ -2220,10 +2220,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2.5"; + version = "9.2.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.5.tar"; - sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1"; + url = "https://elpa.gnu.org/packages/org-9.2.6.tar"; + sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4"; }; packageRequires = []; meta = { @@ -2385,10 +2385,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.2.8"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar"; - sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar"; + sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5"; }; packageRequires = [ emacs ]; meta = { @@ -3001,10 +3001,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1"; + version = "3.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar"; - sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar"; + sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg"; }; packageRequires = [ emacs ]; meta = { @@ -3590,10 +3590,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.17.tar"; - sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"; + url = "https://elpa.gnu.org/packages/xelb-0.18.tar"; + sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index def54a99e68..3d0011eb0f0 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20190819, - 1232 + 20190902, + 929 ], - "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5", - "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5" + "commit": "87efcc058f40e8a38a613cb479a2affba9f0ebe5", + "sha256": "0cdh64z1mass9fl05n9xn1q82ka38iar27g5dsidkfhlg6wqxmlk" }, "stable": { "version": [ @@ -442,27 +442,27 @@ "repo": "atilaneves/ac-dcd", "unstable": { "version": [ - 20190425, - 907 + 20190902, + 1124 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "9d444523ffa92a763ea8f532b8001829a51a2557", - "sha256": "1fkpvr7mix9wvhd6pgbcj6mrmhrffvlh5sp8wp5m48j0qc3wx7mi" + "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857", + "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49", - "sha256": "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn" + "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857", + "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" } }, { @@ -1065,8 +1065,8 @@ "auto-complete", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -1411,15 +1411,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20190123, - 402 + 20190917, + 318 ], "deps": [ "avy", "pinyinlib" ], - "commit": "4915b2413359d85002918e322dbc90c4984b4277", - "sha256": "1yv3445p6w10wj310ffla2ghh81fynwgmxpsfkwgbcsbcjx9hmsl" + "commit": "8b2e9335b02486730ea4ceee790130cc5328f9ea", + "sha256": "1p2h4bva0v8yad075is1zkhn69x78ddwa8ncdfm0zzysddw5w8bq" }, "stable": { "version": [ @@ -1564,30 +1564,32 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20190423, - 1529 + 20190916, + 1212 ], "deps": [ - "cl", + "cl-lib", "json", "projectile", "request" ], - "commit": "c2ad321952524d88dd34842a6989b6e2d8acb646", - "sha256": "1fan25w5zb33i8mbd06iwz8vjac0alcv1r73h9hyzdkn8ivl6k3s" + "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", + "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], "deps": [ + "cl-lib", + "json", "projectile", "request" ], - "commit": "27a0841b32dfd2b691a1dcf3a4a50d74660676b1", - "sha256": "1hfmll3g33529pshzvh2gxqr0h53p1v68wq0zlq2h2wfml89bzr9" + "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", + "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" } }, { @@ -1857,11 +1859,11 @@ "repo": "agriggio/ahg", "unstable": { "version": [ - 20190708, - 1358 + 20190903, + 1349 ], - "commit": "f5ffd8f592ce9038f1dd30594124ad83e2976fdf", - "sha256": "06k7hyvizhg8xrlckxcgsd5lmlqk2skhah4z914n21759yhzvf61" + "commit": "c85d951d7376425156911e5f3cd7535b4ecfbfc3", + "sha256": "0j5h1yjhg7lj3zxznfzy7mqj2c2r4cwdg8xik3wlk2cnm27fhgz6" } }, { @@ -2144,8 +2146,8 @@ "gntp", "log4e" ], - "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1", - "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf" + "commit": "b5ef49bbb871867ac03d2943a720576336cd7025", + "sha256": "00lhx0gd1myzjfp59hjk0z44xf0cr4njvzwjdacahim7gz3hhicd" }, "stable": { "version": [ @@ -2507,8 +2509,8 @@ "repo": "proofit404/anaconda-mode", "unstable": { "version": [ - 20190616, - 1019 + 20190918, + 353 ], "deps": [ "dash", @@ -2516,8 +2518,8 @@ "pythonic", "s" ], - "commit": "24aa81ba62f13d7bb505a03fe244181c461fec68", - "sha256": "166szgnm8mkw4gqcn87b6k4f2s1fv2k20zc9fkwif2mr2bk88c1v" + "commit": "d9c5ffdd12d8e81eb4e935e6a6523af8c80f0106", + "sha256": "0s0166qnzrxmxida8f80j2z2spfl10qcvbmddgvqaj8mr9f898bf" }, "stable": { "version": [ @@ -2582,20 +2584,20 @@ "repo": "remvee/android-mode", "unstable": { "version": [ - 20190109, - 1014 + 20190903, + 811 ], - "commit": "d60c88bfbd2dc5122bd2fde7dc11ec1e6848a5db", - "sha256": "1hd7wxp8f67cnbyjs4bv9x18nvzn16qjy4pi7bkbcymfpwj33r38" + "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6", + "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck" }, "stable": { "version": [ 0, 5, - 1 + 2 ], - "commit": "f8cabafaa266b56fcf4b3c6942b3ae062735251a", - "sha256": "0npx54w565mkxkgkpv02dgmfc44i1256p0w331pf3nfxq145xh27" + "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6", + "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck" } }, { @@ -2723,6 +2725,36 @@ } }, { + "ename": "annalist", + "commit": "2298cf2894029267c77a8aa06f4fa8d9d7c3e4f0", + "sha256": "1102yd0vas3kyml8flf3mdswnc2kizbdq996740plzwnnnbw34vj", + "fetcher": "github", + "repo": "noctuid/annalist.el", + "unstable": { + "version": [ + 20190905, + 5 + ], + "deps": [ + "cl-lib" + ], + "commit": "8f52a365b2876f034fbf9b335786fa6bafc9ac80", + "sha256": "0qscah37qs65wykkw9nc5n5xgd4fy8w1jv6mznk4fbpds6qaxrjh" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "0da9812e419b1687cf1e7040384f983be32d5328", + "sha256": "1dws8r39asjnxzjq4ixlja1ih6kphw0w666k685m7ncq9jmr6jw6" + } + }, + { "ename": "annotate", "commit": "3aae88b8e3b080501195d291012deab31aaf35f7", "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy", @@ -2730,11 +2762,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20190519, - 706 + 20190918, + 714 ], - "commit": "09d0cd89e458779ca375ac28bc664ee2e20db530", - "sha256": "141pqfrrzbqaxxcr6m6ri9r6k1mg5i3cv8v2kili365cypnjdg1y" + "commit": "cb8de5081ab4adda81806a44ba91ba70d05d4ffb", + "sha256": "1xxx2iafl8fkp2mmdkl6l8f7bml6g1azc746vwwxsx0yiim48jm9" }, "stable": { "version": [ @@ -3328,8 +3360,8 @@ 20190816, 25 ], - "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", - "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f" + "commit": "32e08d5a8ad2f305578e0f783e087c1d312238c7", + "sha256": "00135gq4xfblv50dwxq02dd1y18xv29lrl7iir3caq4pr3nhrshg" } }, { @@ -3490,6 +3522,21 @@ } }, { + "ename": "asx", + "commit": "2eda72c3574c41184104532bb129cbe0efc8afd4", + "sha256": "0kijqfwkwm5kd1h3v0rab9fm8ivmqnmijy065iz5xhmi3yicx4aq", + "fetcher": "github", + "repo": "ragone/asx", + "unstable": { + "version": [ + 20190916, + 2122 + ], + "commit": "903e01d2856a95427bdf7d41d9628b3886e90867", + "sha256": "09dv2imw5mcpw3n42hgwiw7c3wb31f74ci7hbqa5rk140rrvhf8j" + } + }, + { "ename": "async", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4", @@ -3610,8 +3657,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20190805, - 1829 + 20190918, + 828 ], "deps": [ "dash", @@ -3619,8 +3666,8 @@ "flycheck", "s" ], - "commit": "25d34a6c5f13ee6de5da60f3dae25d7e4961d991", - "sha256": "0bvymi8cfalv64a5zh1ln641qfgrdmqvsfd0d9c82xjrz19ffnpm" + "commit": "18cd1f7832870a36c404e872fa83a271fe8e688d", + "sha256": "078391949h0fgmshin8f79a1a595m06ig577rkgjqgngcp0d61l9" }, "stable": { "version": [ @@ -4196,11 +4243,11 @@ "repo": "mattfidler/auto-indent-mode.el", "unstable": { "version": [ - 20171222, - 506 + 20190917, + 1430 ], - "commit": "28069360a7f89ad0286fd6a53db550752ec58488", - "sha256": "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii" + "commit": "e6da518d5d8c3137b4f0a437a845401e34e6f193", + "sha256": "09dnhjd55pdpg3vvs6ygk7lfmimdc66dx2qfz8zbcqbz49j84kxi" }, "stable": { "version": [ @@ -4470,15 +4517,15 @@ "repo": "Fuco1/autobookmarks", "unstable": { "version": [ - 20180531, - 1906 + 20190919, + 841 ], "deps": [ "cl-lib", "dash" ], - "commit": "e971aa49d97da9f7ed760b37e0b674e45f1c5673", - "sha256": "04453h3s9g7ka028s4f97z606czq3vsvphrmba533jkl8lk3hpi8" + "commit": "224b24950d3ae57cd16d7417c07fda337fe0ea09", + "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9" } }, { @@ -4583,8 +4630,8 @@ 20190331, 2230 ], - "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", - "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" + "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b", + "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a" } }, { @@ -4862,6 +4909,21 @@ } }, { + "ename": "awscli-capf", + "commit": "286c5963541f099032890c6df3bbe39648fb8684", + "sha256": "1mggykjjdl74rbgnw4k0q01iqdhl09q9zgp51xakgy07vpjs49w0", + "fetcher": "github", + "repo": "sebasmonia/awscli-capf", + "unstable": { + "version": [ + 20190909, + 1534 + ], + "commit": "6670b4db6bd35f0ea9ede598a9c17384046f4400", + "sha256": "0pnz8jiapd8i8ya2j9lns22rg903iq65pby89wpmz7cidzg6lgf0" + } + }, + { "ename": "axiom-environment", "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf", "sha256": "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb", @@ -4961,11 +5023,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20190821, - 1808 + 20190905, + 519 ], - "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987", - "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg" + "commit": "3e5b971b4ee89299240a89614db92d2c4034e954", + "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa" } }, { @@ -5097,6 +5159,21 @@ } }, { + "ename": "balanced-windows", + "commit": "2dc9c15d14d4417df74b73cde983ef4f25eda363", + "sha256": "0y53als0cmd4h0z1w55f4z5w6zkk7ig0ygjrzjv2khwig8hl2b8h", + "fetcher": "github", + "repo": "wbolster/emacs-balanced-windows", + "unstable": { + "version": [ + 20190903, + 1120 + ], + "commit": "1da5354ad8a9235d13928e2ee0863f3642ccdd13", + "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l" + } + }, + { "ename": "bang", "commit": "d9830cce42339243091f4463490954a8a955c65f", "sha256": "1dx1130095ij09ix20jyqradkjw9gpdfpw0d9f3krrx6xjqfn2sk", @@ -5735,11 +5812,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20190224, - 1816 + 20190917, + 1545 ], - "commit": "0937ac9a813632c48d114cf959768cda9676db3a", - "sha256": "0zwixak4aysj6hckg7h7qj6ha6n7fb9v66drfpgjcg4ylg500anr" + "commit": "01b8f00235c37bddf3e1a949e943dc0c9980863a", + "sha256": "0qniwfdip1ksxwx52xwsx9sgy7vfcsixsccmx877w4rlv893plah" }, "stable": { "version": [ @@ -5947,8 +6024,8 @@ "a", "pdf-tools" ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -6095,8 +6172,8 @@ "bind-key", "key-chord" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -6122,8 +6199,8 @@ 20180513, 430 ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -6304,8 +6381,8 @@ 20161216, 656 ], - "commit": "d8b984f2541bb86eb4363a2b4c94631e49843d4a", - "sha256": "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh" + "commit": "7a0d79410feb728ff5cce75c140fadc19a3f9a6d", + "sha256": "00hws9fbf7hy11hnicgk2q3din0z8hdq7my00aaw7b8nnb8q4g89" }, "stable": { "version": [ @@ -6324,11 +6401,11 @@ "repo": "proofit404/blacken", "unstable": { "version": [ - 20190521, - 841 + 20190917, + 535 ], - "commit": "1874018ae242176d0780cdcd0109e8f9a123a914", - "sha256": "1zgx7j4cp51r2cdlyf744jgfpid4lz7fwwjxbm6cvcp9hv57v7wz" + "commit": "9daacd1211b081e76f02d4ef128d7f44c88d8fd0", + "sha256": "0f6ji0gs6gb6kc931yv5j6hbvb5d405xxzsbrgkivc9wxpypcfwg" } }, { @@ -6649,8 +6726,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20190710, - 2300 + 20190909, + 1432 ], "deps": [ "cl-lib", @@ -6659,8 +6736,8 @@ "flycheck", "yasnippet" ], - "commit": "a7536291e4ef1e97d369b1b76b6a31906ef5e348", - "sha256": "1cq2dg71lavn4xp2pmvz784ir0lqyb4hhsj2893kllvm912hw3a6" + "commit": "45ee305eba1cce63f89e49daef9eaeaa90e34265", + "sha256": "0dnmg84ynxr4vhdgrzdvrq68jrrmp9vkz0lbwhlxpljckpmfdf03" } }, { @@ -6695,16 +6772,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190828, - 655 + 20190918, + 601 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9", - "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw" + "commit": "07534c76d6bd3cd9307cc53deb59f11746f91ecc", + "sha256": "16rzjr52g4jn96xsa6z1acl9zipq46pg8rhcgxri43cdanwkfqin" }, "stable": { "version": [ @@ -6728,16 +6805,16 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20190802, - 2023 + 20190902, + 1510 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "b338e13e8de7bb2e0eef093fdb79fb763910c7e8", - "sha256": "0ydj3xs856gbm559f20zrnag5rbhy9s60qs2x5kwwdn921mdcsgj" + "commit": "e4a53ec687a1e2f75276c2f2c2b568266887fe10", + "sha256": "1s01gwnpqrkr60r0xn27231854qpqqbqphiy200x7hmkq93wzlhv" }, "stable": { "version": [ @@ -7005,8 +7082,8 @@ 20181023, 1222 ], - "commit": "8899f4f4a7faf0080977cd137e0ad7b00c40f1e8", - "sha256": "0ghq8n0lnidjz5m0i2wsmdrk2nwbwh6l8imxfhkva7qpaha4jqyq" + "commit": "6568844b83dc916a5d6aa69960cbc85ded5f7d73", + "sha256": "1b76hvk87p3glrlbm8gj4w6r7y7gqa5yq8hdxq31m2swqg8h3k52" } }, { @@ -7595,19 +7672,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20190828, - 2027 + 20190906, + 1433 ], - "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779", - "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2" + "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7", + "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh" }, "stable": { "version": [ 1, - 16 + 17 ], - "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485", - "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1" + "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7", + "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh" } }, { @@ -8219,15 +8296,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20190816, - 1046 + 20190902, + 754 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f", - "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0" + "commit": "39a77e48a16d69b2e841084a3dbbbd083f166a21", + "sha256": "0wyqqc22my842ag999hnfijycfck888z1pbm6acaa6h6cczm1ya9" }, "stable": { "version": [ @@ -8695,15 +8772,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20190812, - 1915 + 20190919, + 2028 ], "deps": [ "cl-lib", "powerline" ], - "commit": "de3738c14b8e73e135c16e26ca405f18459fbb20", - "sha256": "11w5nhiaz7wrb8kgkv832xg0fmm0251wy6klxrk5gsdjh2c5qf26" + "commit": "90220c26cbc77b121eeb065e30f6d7a395ef131f", + "sha256": "1hrrsz4pbblmxyhds3253sjpk3gqb4zwjwwdl8b3shgamrhwl7y3" } }, { @@ -8818,8 +8895,8 @@ 20171115, 2108 ], - "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f", - "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz" + "commit": "732b7da25a22c9846aca4badecee9b6d08c54c9b", + "sha256": "0w4qqwjxa5v48skq7xzb57fbdgjf2il5zs7650k0gz490rh50rwj" }, "stable": { "version": [ @@ -9457,8 +9534,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190829, - 613 + 20190920, + 850 ], "deps": [ "clojure-mode", @@ -9469,25 +9546,26 @@ "sesman", "spinner" ], - "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493", - "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi" + "commit": "b2449eca413c5800b0239588c5d4345d8381eff6", + "sha256": "1lrmzxhny6bldzvljqgd9hih7rg62fqdxv9dk65qnsm16vncmkgv" }, "stable": { "version": [ 0, - 21, - 0 + 22, + 1 ], "deps": [ "clojure-mode", + "parseedn", "pkg-info", "queue", "seq", "sesman", "spinner" ], - "commit": "200c88adb1314b5811ba749af42ffb6817c1ca1b", - "sha256": "0lbrwj67fnvynkdkzvnzp3p8vqlz0ldrcs317vg60bqfhx7hvqkj" + "commit": "8a1262dae8f86f03fa2ec0abdbced10ff7e5ee1e", + "sha256": "0pjp1gcvhmbdh10w2yall9a7bbprg2z2hmmkwhqxcalsaacwfz0x" } }, { @@ -9720,8 +9798,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20190422, - 2017 + 20190914, + 613 ], "deps": [ "dash", @@ -9731,8 +9809,8 @@ "s", "string-inflection" ], - "commit": "abab214473b7486f662c147f1c36b2a6b4b0302d", - "sha256": "0x4pjmjvi53ysfz1c0l1vi8fvd49fsdmn1j9g8zdry5b2kv36siw" + "commit": "fd2188e5d76ca78723567ae3b369ae542402e633", + "sha256": "0a924bpb15259dlv8ry5bhlq61yczy31fnsbvx2lhzf9r0i06vvc" }, "stable": { "version": [ @@ -9958,14 +10036,14 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20181229, - 1411 + 20190920, + 149 ], "deps": [ "ivy" ], - "commit": "232ab0b3f6d502de61ebe76681a6a04d4223b877", - "sha256": "0is772r0b7i8rvra9zb94g9aczv8b6q0dmdk67wbli5rv5drfjyq" + "commit": "3105e5c4b4d2d0338edb6effd9329426854b80b1", + "sha256": "0jbn2nczhsv9adhkc6mnrmxyjbpkbqq475gry0khhqlmzm49y618" }, "stable": { "version": [ @@ -10223,11 +10301,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20190725, - 654 + 20190914, + 1029 ], - "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048", - "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs" + "commit": "147bf84189ef672161b2229ddc5c35713323ad59", + "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" }, "stable": { "version": [ @@ -10253,8 +10331,8 @@ "deps": [ "clojure-mode" ], - "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048", - "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs" + "commit": "147bf84189ef672161b2229ddc5c35713323ad59", + "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" }, "stable": { "version": [ @@ -10418,11 +10496,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190826, - 2117 + 20190901, + 1701 ], - "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a", - "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6" + "commit": "08090f00738809306fa156aac60d85ad6be9e672", + "sha256": "17a5xdn2m7gdaw71b79xs1cprh4jqgwsfgmb52gz2yaxb20hg7xy" } }, { @@ -10556,17 +10634,21 @@ 20190710, 1319 ], - "commit": "c0d21d763b13e280ccf7a387ba690650db014646", - "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz" + "commit": "ebb9346490741ddc2ce6f552bc1be57dfc730cfa", + "sha256": "17rn81cg9df4da6jw9xnq5ldk1a58hvql9xhs59n3cc8v21v81pd" }, "stable": { "version": [ 3, 15, - 2 + 3 ], - "commit": "40bbe50e23c06232ccf1c49589dde5dd84e1ac31", - "sha256": "006ziv2imzxpq646f3vq30ylbpp84l2hf7ki0l7s521g1ikh1dy0" + "commit": "26a0e200e5f4abe8268235c9fdb23a2612a1b3b1", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-2hzFmDuI/cmake-26a0e20/.git/\nfatal: invalid refspec '+refs/tags/v3.15.3^{}'\nfatal: write error: No space left on device\nfatal: index-pack failed\nUnable to checkout 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 from https://gitlab.kitware.com/cmake/cmake.git.\n" + ] } }, { @@ -10681,6 +10763,21 @@ } }, { + "ename": "codcut", + "commit": "0fcd1c7a483dd377674a71a07fd86297f05cc83b", + "sha256": "1pmbsv7pzmlbkfcw4ihpi5k7pgcrwlcg1hp0wkhkii8w61dq62x6", + "fetcher": "github", + "repo": "codcut/codcut-emacs", + "unstable": { + "version": [ + 20190915, + 1009 + ], + "commit": "bf07c3db3900e36b0b87423f3b715d6378f86393", + "sha256": "1wraxwnhf3xmlhc0ijh1ca9xqrxzxgih4dzca34smwp7dssz3xha" + } + }, + { "ename": "code-archive", "commit": "a8d0832eff966874d90e1d5ac1043c03e96b1c25", "sha256": "0rj7cvwzhgam25jxjw5aqx9cxa86008gx2mwcyjlbnjrkhcbi97a", @@ -11051,11 +11148,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190826, - 1340 + 20190904, + 520 ], - "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f", - "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq" + "commit": "d43905165503bc5e3bf4c658b414884f5cb434e5", + "sha256": "0hzy863abchc46cpig8mnn4c885df02h8m2z7m257krkv5aggmif" }, "stable": { "version": [ @@ -11165,11 +11262,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20180831, - 721 + 20190918, + 14 ], - "commit": "69d59284e19428794b5c0aaa9be0e7d2770cc846", - "sha256": "17kcj0bkarr9biyjf1kkj4l1n9qfh6lkhwfd32qlr5k7pnwnbirb" + "commit": "a68fd0274592e8dcca28a337c9ee913cb84efa9b", + "sha256": "1n2nk8nhvfiz8dw863q91k04jrmafirdi0mj88awq9ibpw453vzz" }, "stable": { "version": [ @@ -11437,10 +11534,10 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20190821, - 658 + 20190907, + 1149 ], - "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a", + "commit": "f6974e3103497afe01da2ad4d2ea3668ad68bc27", "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp" }, "stable": { @@ -11471,8 +11568,8 @@ "dash", "s" ], - "commit": "0ab70de1740e67cee451abcf3685c7525ff9e95a", - "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil" + "commit": "2cc1c98ab6fe1d908229a1e26adccf2c10da1ecc", + "sha256": "162dbc5rgwvvfqirn9pkrxc0cl1lbl56xb9hg3md48hpshpnwwba" }, "stable": { "version": [ @@ -12213,8 +12310,8 @@ "lean-mode", "s" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -12455,8 +12552,8 @@ "company", "phpactor" ], - "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", - "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" + "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", + "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" }, "stable": { "version": [ @@ -12539,27 +12636,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190706, - 1917 + 20190921, + 3 ], "deps": [ "company", "prescient" ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "company", "prescient" ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -12703,8 +12800,8 @@ "company", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -12735,8 +12832,8 @@ "company", "dash" ], - "commit": "6ae625f80d90e0779c79de38e8f83a336c1d00fa", - "sha256": "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy" + "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", + "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" }, "stable": { "version": [ @@ -12888,8 +12985,8 @@ "s", "unicode-escape" ], - "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094", - "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c" + "commit": "81b7440a7253e1753cf41932237fd64c1c1e44b6", + "sha256": "15nmli9drrb25d5xn31v1ja2hmc9kgpn2hjj6b2azj391yw0q4a3" } }, { @@ -13084,11 +13181,11 @@ "repo": "paldepind/composable.el", "unstable": { "version": [ - 20190728, - 1527 + 20190904, + 701 ], - "commit": "b2139cd6f4434197ae0c678091c78b72fd022fed", - "sha256": "043g55gzvxvdplgxz1w1gl367k0nnblmi6ifdg98gl4z4xlqfc1j" + "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390", + "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx" }, "stable": { "version": [ @@ -13511,27 +13608,26 @@ "repo": "zonuexe/emacs-copyit", "unstable": { "version": [ - 20161126, - 1229 + 20190919, + 1258 ], "deps": [ - "cl-lib", "s" ], - "commit": "f50d033b129d467fb517a351adf3f16cabd82a62", - "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ - "cl-lib" + "s" ], - "commit": "c973d3650208a033aaf845989d023f9c6e572ddd", - "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" } }, { @@ -13542,28 +13638,28 @@ "repo": "zonuexe/emacs-copyit", "unstable": { "version": [ - 20160624, - 2028 + 20190919, + 1258 ], "deps": [ "copyit", "pandoc" ], - "commit": "f50d033b129d467fb517a351adf3f16cabd82a62", - "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ "copyit", "pandoc" ], - "commit": "c973d3650208a033aaf845989d023f9c6e572ddd", - "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" } }, { @@ -13818,15 +13914,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20190422, - 1501 + 20190909, + 1740 ], "deps": [ "counsel", "seq" ], - "commit": "3ebfd4159856e9dbd9531b2a43410f72175a90bb", - "sha256": "08n11nvf7p6clmha8r50r2fzp9f4nmrcm8j6byvn99vazdvych7p" + "commit": "13d4aed6d70d96b86f55ffa38e60540c14ef0ce3", + "sha256": "11nhmy2si0z7ppkmyq3fk9mfwbnsk9m9k6mdd6dc9x6r560f3hyj" }, "stable": { "version": [ @@ -14806,19 +14902,19 @@ "repo": "maurooaranda/ctune", "unstable": { "version": [ - 20190709, - 1309 + 20190914, + 1305 ], - "commit": "ae298d617237c65ddebc52d236230be11fd4126d", - "sha256": "1w6rljq4aqr7m9j18s7zaw7alllxmk819938pzmgl9pkjscmva0k" + "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee", + "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "5633024d14957cd6eff03574b2044bb8e9b55710", - "sha256": "1gxhjgh4rs1gnva3a33wr2si594r4qywv20087hfbjlgli7114n0" + "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee", + "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4" } }, { @@ -15131,8 +15227,8 @@ 20190111, 2150 ], - "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3", - "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38" + "commit": "7e233ab00e117b2e7165c246941ac85a989be262", + "sha256": "1189hi8vp2albpvfz5b66327qizzkzkg9p9b6l8157jsm6a03y7p" }, "stable": { "version": [ @@ -15339,8 +15435,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190823, - 1240 + 20190917, + 548 ], "deps": [ "bui", @@ -15351,8 +15447,8 @@ "s", "tree-mode" ], - "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a", - "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk" + "commit": "2e0f7dd70656aad5a70ce2b4f5375870084a02f3", + "sha256": "0hckyrv470j8zx5sr24h16fa9a3fxa8i7iwywxs15wwrwl6mqh9m" }, "stable": { "version": [ @@ -15604,11 +15700,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20190814, - 2006 + 20190920, + 1035 ], - "commit": "11907f4592ff1813536366d54245d3ecf6b99198", - "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" + "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c", + "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i" }, "stable": { "version": [ @@ -15683,8 +15779,8 @@ "deps": [ "dash" ], - "commit": "11907f4592ff1813536366d54245d3ecf6b99198", - "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" + "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c", + "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i" }, "stable": { "version": [ @@ -16554,14 +16650,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20190526, - 2113 + 20190919, + 2242 ], "deps": [ "reformatter" ], - "commit": "1b71e8e7123647761d8f35916c06b7280b2929ea", - "sha256": "12xpzaby75fczxj885ij9wgrc9pn05mg5s7abgfr1irvkq7s467n" + "commit": "57001a69917329e7933d80a7e21116fe11255ae7", + "sha256": "039lgmap36iawvw89jhkq25j9h2r9qb8s3612j5xhyzbbrg6q0pl" } }, { @@ -18012,6 +18108,21 @@ } }, { + "ename": "dispwatch", + "commit": "580cee72ac9871f8f256069b371f7fb66367a048", + "sha256": "1cq5lbh3r9jjwixn2q30gryy4j4l8jb70nkhsjbaln1c3jdwrf9p", + "fetcher": "github", + "repo": "mnp/dispwatch", + "unstable": { + "version": [ + 20190903, + 356 + ], + "commit": "04e7ecb52636e27a8e2e670c6e8977c12ed989e6", + "sha256": "0yv4gl86z9wx81n1hadha01iqcinp2c3414hg5iypv2j7n129kri" + } + }, + { "ename": "dist-file-mode", "commit": "dd10fbed2810a642600dba9dfe320fa6299e6d34", "sha256": "1gbnkb0537gw8flv4gdi4jzb7y9dnbf9cfj2jw8y84axyfzbb4mf", @@ -18358,14 +18469,14 @@ "repo": "lujun9972/el-dmenu", "unstable": { "version": [ - 20190706, - 951 + 20190908, + 44 ], "deps": [ "cl-lib" ], - "commit": "93c09c04441ad96902ba2aab2bdb556f7e34a53b", - "sha256": "0dm9z05980l7z2k4p0j5n6f4sis1va5am3hk1zsaa9z7fvhpbci3" + "commit": "e8cc9b27c79d3ecc252267c082ab8e9c82eab264", + "sha256": "098ncygms1r33zhjlq4fj2p4jc91v5whqrm3fazzdk7sd6dilf25" } }, { @@ -18703,30 +18814,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190830, - 1605 + 20190918, + 1510 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "b433d87f428061cc7477b444b7dc9101e575095d", - "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx" + "commit": "2690aa27892380b4e857efee4b7a76ff3a87e538", + "sha256": "020zwg15ww40mss7ndc56hji16rmpllab3rkm0k6z79h9jmmc01c" }, "stable": { "version": [ 2, - 5, - 0 + 6, + 1 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "eb3258b50399ae7a2ed2edea797238a21352ea22", - "sha256": "1xx2zjksh93z6px89w4grycry9m8vh864m0p471q0g77r16z2prn" + "commit": "b117f2e86920c0bb3a61ce64c59a6f5db05a11e9", + "sha256": "1lzw3nfqrymrgc9vhd5zzffjy79sdfiihx3mphp5hny8f1nw912g" } }, { @@ -18737,14 +18848,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190821, - 2117 + 20190904, + 2252 ], "deps": [ "cl-lib" ], - "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598", - "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p" + "commit": "1159463956223ae53df421bcd796e94610759c42", + "sha256": "0jacmhqvvsqy5w7zxsr5nxka1pxysz74zkv5lfvbqkay59asn95z" }, "stable": { "version": [ @@ -19096,15 +19207,16 @@ "repo": "pavpanchekha/dropbox.el", "unstable": { "version": [ - 20190714, - 1721 + 20190918, + 1629 ], "deps": [ "json", - "oauth" + "oauth", + "request" ], - "commit": "2a143087aff0a69a8ff4df40f87335501945346e", - "sha256": "0xf6lsrrv4n9acbglhccikv5lrgfqmkqvz7bbw91rmwx5wvjs1f7" + "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691", + "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a" } }, { @@ -19302,8 +19414,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20190804, - 533 + 20190920, + 1531 ], "deps": [ "dash", @@ -19311,14 +19423,14 @@ "popup", "s" ], - "commit": "7ffa63cdc8481158a2dbfe4acc6719ebe7fff056", - "sha256": "1l682xjish7v8mdkfdjqbdz464hnif15xlyrq8il6pgcq12g2hl6" + "commit": "56e955b9c3619616c176e311f1b67811548ad4af", + "sha256": "01n4nv8f0zsfhzg7xqbv3zjvwdxk7nyq2h50gckm8mlx86f30kwj" }, "stable": { "version": [ 0, 5, - 2 + 3 ], "deps": [ "dash", @@ -19326,8 +19438,8 @@ "popup", "s" ], - "commit": "260054500d4731c36574b6cbc519de29fdd22f43", - "sha256": "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin" + "commit": "0319569f1332641057c3e23d1e3bffb2404435a8", + "sha256": "1njf60264snhxrd36m4z687lqfkis0p9mmrr7cf1c8l0lfdvawxi" } }, { @@ -19353,11 +19465,11 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20190808, - 345 + 20190911, + 1607 ], - "commit": "823a3c66d11b30333f511c03348bd4714e736f46", - "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9" + "commit": "2aac0728daa65780df9187a409a1c166ff9ab6bf", + "sha256": "0y4zqmwrzabz1hcpn7wads7z7gacr3ry25pi8i0fka69hz3h4s9k" }, "stable": { "version": [ @@ -19425,11 +19537,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20190109, - 300 + 20190831, + 1910 ], - "commit": "9a6ad5ff83f2dfc25ce3deee9d3ef71ed53964b5", - "sha256": "1d6krgiabkrj3mryaz79vmiqy0vkr5s8ji34yjd14v73ikzwxwkp" + "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4", + "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma" } }, { @@ -20025,14 +20137,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20190718, - 2011 + 20190914, + 753 ], "deps": [ "parsebib" ], - "commit": "603451582c3471c90fbf795baa2f53043ce5ddb0", - "sha256": "01s1aghyc83372nkccjfx3yn65hqx5hrxbsj1dcbb6z1y5aqbwdj" + "commit": "8b2019c4f25a80dfeddaa6d1e82c668a52ffba8d", + "sha256": "0r8lqa120kqxqaa465lm03rbakpq19dr7pmjp0gbgcbgm3r9pvn6" }, "stable": { "version": [ @@ -20878,15 +20990,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190819, - 9 + 20190910, + 1347 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d", - "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh" + "commit": "28ecd5df456fec6113751bd52816095e0be3e651", + "sha256": "1k2l77srl5j904x33sz7davfk1gmncpi87gj8yiavnyxml9snpcf" }, "stable": { "version": [ @@ -21059,8 +21171,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190828, - 919 + 20190914, + 1925 ], "deps": [ "auto-complete", @@ -21069,8 +21181,8 @@ "direx", "spinner" ], - "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9", - "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l" + "commit": "a1e4d7c31c11f7c124c58408cebeb77e473fc535", + "sha256": "1zjx5n1gj0lvxzf47vv8bv87kbz1p6vnbgw31h3aarsdx0c09m3a" }, "stable": { "version": [ @@ -21153,8 +21265,8 @@ 20181006, 225 ], - "commit": "e8bdc7be1a61faf61787d4a3c0b80dafc37d2ef4", - "sha256": "09mb43cdl711dva0hv7jln35nz0r4q0m6r3zbv563s8wnqpza7ig" + "commit": "156d1a0bbbf330b3f274b0afb7a8366d7f04b8c7", + "sha256": "1mm4xphk9h8p9f3pl4brqyksk3lmnw4cr78j933p28qcmgk8sr7w" }, "stable": { "version": [ @@ -21725,11 +21837,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190824, - 1213 + 20190903, + 1137 ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "69b0320156cbf7e395efa670464d4651f708332f", + "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" }, "stable": { "version": [ @@ -21826,15 +21938,15 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190824, - 1213 + 20190906, + 2012 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "69b0320156cbf7e395efa670464d4651f708332f", + "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" }, "stable": { "version": [ @@ -21858,14 +21970,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20190729, - 811 + 20190917, + 2320 ], "deps": [ "async" ], - "commit": "7a4e8f3c99c8a50b92881f0bf0f29a3cd6098324", - "sha256": "0v6f91y43q4hfd4rhwgwh5wqw2hmzdf1rc4rkngg1qh554ml5glz" + "commit": "c644ed57337fdf117de5b7e342c2623d4f17e8f7", + "sha256": "1j757kclw54y3cn839jjdsbkydf3sc0bjkkii50gvy65kp46fqhp" }, "stable": { "version": [ @@ -22106,14 +22218,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20190422, - 155 + 20190831, + 2225 ], "deps": [ "pkg-info" ], - "commit": "694d133e847e9a6db6abd1c19850cec6d867ccce", - "sha256": "0fl3i8cxnrn70l68328jyhabgccmqbislkgp4k4ih5yll3plz31n" + "commit": "5c50dcedd890f14e0ede33b74ddf86607b037239", + "sha256": "0hi8ly4jplhlh4mrmwlhz44w50ccjbc4w12jkacjc82gay8m8yfa" }, "stable": { "version": [ @@ -22166,15 +22278,15 @@ "repo": "walseb/ellocate", "unstable": { "version": [ - 20190819, - 211 + 20190920, + 1407 ], "deps": [ "f", "s" ], - "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08", - "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292" + "commit": "798c40de09ebfff40fd1aa5b996bd8390f803bdf", + "sha256": "1z1g1v3q5zdljkdziv8jnyjm2n4jxdfbds1qqwddlaz143b4h5zb" } }, { @@ -22467,20 +22579,20 @@ "repo": "tgvaughan/elpher", "unstable": { "version": [ - 20190816, - 1414 + 20190920, + 1533 ], - "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c", - "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq" + "commit": "e2d59f11515f2879bdc2675528b74fbb9b802bea", + "sha256": "1ghjz22vyidgss430y6w4znvx135b0avdmk7hh7mx4vbnq0m1j07" }, "stable": { "version": [ - 1, - 4, - 7 + 2, + 3, + 5 ], - "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac", - "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c" + "commit": "c0ff9d26c2e5cf62ade93852e7eb8a0f081bf028", + "sha256": "0khgplpwm7dzsxfh43i1lgwrwskmyxaz9qcgzs0vx9c4vm8c1byk" } }, { @@ -22506,8 +22618,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20190725, - 2259 + 20190913, + 936 ], "deps": [ "company", @@ -22517,14 +22629,14 @@ "s", "yasnippet" ], - "commit": "7acdd14eaec4b123ae1c16ead59c91adcf7f9775", - "sha256": "182zs3b7s0n4wsz0k1wybmd3fa4x9m7q5j8n7jpbwa3m0v3vvyk7" + "commit": "370dd4ced755b668ce2d7c91f742cd09337d98c4", + "sha256": "0zji9p62wyan9z7l01q54j06xdscy27ll3c1mnlfxvb7n3v5xdya" }, "stable": { "version": [ 1, - 29, - 1 + 31, + 0 ], "deps": [ "company", @@ -22534,8 +22646,8 @@ "s", "yasnippet" ], - "commit": "d98ee26f564e33c9acf233862734e72200bd3703", - "sha256": "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf" + "commit": "54ed6fe219689e187286c8808041b6f61718b025", + "sha256": "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk" } }, { @@ -22821,11 +22933,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20190710, - 1415 + 20190904, + 1331 ], - "commit": "457fca9d4bb0429b08c8f4e675f8b1f3e48297e3", - "sha256": "0vpvdnmg95nk9bmrjysbpfwbyzxhipdqh9xfphxi2n63sd0vzk7z" + "commit": "aec740bb4453a8b671beccd31a583225fb2eb104", + "sha256": "144mh3klxqv70qz5qksj5dzgcczc6wwscwwi2mx07x6s3vbgmfal" }, "stable": { "version": [ @@ -22898,20 +23010,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20161028, - 1706 + 20190917, + 1102 ], - "commit": "421e0c567358769e32f670ae8e949d99abae0c28", - "sha256": "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8" + "commit": "57940b93881efabb375df18093b99800bfb5d5f7", + "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" }, "stable": { "version": [ 1, - 2, - 20131027 + 3, + 20190917 ], - "commit": "69607bdc3a0c070e924a3bcac93180f917992368", - "sha256": "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j" + "commit": "57940b93881efabb375df18093b99800bfb5d5f7", + "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" } }, { @@ -23284,14 +23396,14 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20190827, - 1610 + 20190905, + 2111 ], "deps": [ "cl-lib" ], - "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7", - "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2" + "commit": "2bad5e6cf7442cff492cafe896c47719ae77b8fb", + "sha256": "1bxaa1mzx5l1pp16j14y66cywpr174y6q7rhk5qr60lfjjfgj3h6" }, "stable": { "version": [ @@ -24601,17 +24713,24 @@ 20190404, 928 ], - "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06", - "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby" + "commit": "70a3e70ce4fec9e5d79929aa28aecf4a81980322", + "error": [ + "exited abnormally with code 1\n", + "", + "unpacking...\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesNoPoliciesTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesSamePoliciesTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AllCertificatesanyPolicyTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/AnyPolicyTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLIssuerNameCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadCRLSignatureCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadSignedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotAfterDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BadnotBeforeDateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedCRLSigningKeyCRLCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedNewKeyOldWithNewCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/BasicSelfIssuedOldKeyNewWithOldCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/CPSPointerQualifierTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSACACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DSAParametersInheritedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/DifferentPoliciesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GeneralizedTimeCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/GoodsubCAPanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLIssuerNameTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBadCRLSignatureTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedNewWithOldTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidBasicSelfIssuedOldWithNewTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCASignatureTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotAfterDateTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidCAnotBeforeDateTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNSnameConstraintsTest38EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNandRFC822nameConstraintsTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDNnameConstraintsTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidDSASignatureTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEESignatureTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotAfterDateTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidEEnotBeforeDateTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidIDPwithindirectCRLTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidLongSerialNumberTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingFromanyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMappingToanyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingCRLTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidMissingbasicConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingOrderTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNameChainingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidNegativeSerialNumberTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidOldCRLnextUpdateTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRFC822nameConstraintsTest26EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedCATest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidRevokedEETest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitAnyPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedinhibitPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedpathLenConstraintTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSelfIssuedrequireExplicitPolicyTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidSeparateCertificateandCRLKeysTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidURInameConstraintsTest37EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLEntryExtensionTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCRLExtensionTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidUnknownCriticalCertificateExtensionTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidWrongCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcAFalseTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest31EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidcRLIssuerTest35EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLIndicatorNoBaseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddeltaCRLTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvaliddistributionPointTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitAnyPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidinhibitPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalcRLSignFalseTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsAttributeCertsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsCACertsTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlyContainsUserCertsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest20EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidonlySomeReasonsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidpathLenConstraintTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000CRLnextUpdateTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Invalidpre2000UTCEEnotAfterDateTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/InvalidrequireExplicitPolicyTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/LongSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Mapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingFromanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MappingToanyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/MissingbasicConstraintsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NameOrderingCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NegativeSerialNumberCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoPoliciesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/NoissuingDistributionPointCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OldCRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/OverlappingPoliciesTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P12Mapping1to3subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1Mapping1to234subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/P1anyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PanyPolicyMapping1to2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subCAP123Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP1234subsubCAP123P12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subCAP12Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubCAP12P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP123subsubsubCAP12P2P1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subCAP1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP12subsubCAP1P2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/PoliciesP3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280MandatoryAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RFC3280OptionalAttributeTypesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RevokedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/RolloverfromPrintableStringtoUTF8StringCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCRLSigningCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/SeparateCertificateandCRLKeysCertificateSigningCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TrustAnchorRootCertificate.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/TwoCRLsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UIDCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringCaseInsensitiveMatchCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UTF8StringEncodedNamesCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLEntryExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UnknownCRLExtensionCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/UserNoticeQualifierTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedCRLSigningKeyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedNewWithOldTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidBasicSelfIssuedOldWithNewTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidCertificatePathTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNSnameConstraintsTest32EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNandRFC822nameConstraintsTest27EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDNnameConstraintsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSAParameterInheritanceTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidDSASignaturesTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimeCRLnextUpdateTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotAfterDateTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidGeneralizedTimenotBeforeDateTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest22EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest24EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidIDPwithindirectCRLTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest16EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidLongSerialNumberTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingCapitalizationTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameChainingWhitespaceTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNameUIDsTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNegativeSerialNumberTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidNoissuingDistributionPointTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest12EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidPolicyMappingTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280MandatoryAttributeTypesTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC3280OptionalAttributeTypesTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest21EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest23EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRFC822nameConstraintsTest25EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitAnyPolicyTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedinhibitPolicyMappingTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest15EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedpathLenConstraintTest17EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSelfIssuedrequireExplicitPolicyTest6EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidSeparateCertificateandCRLKeysTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidTwoCRLsTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest34EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidURInameConstraintsTest36EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringCaseInsensitiveMatchTest11EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUTF8StringEncodedNamesTest9EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidUnknownNotCriticalCertificateExtensionTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidbasicConstraintsNotCriticalTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest28EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest29EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest30EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidcRLIssuerTest33EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddeltaCRLTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest5EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValiddistributionPointTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitAnyPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidinhibitPolicyMappingTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidkeyUsageNotCriticalTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlyContainsCACertsTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest18EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidonlySomeReasonsTest19EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest13EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest14EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest7EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidpathLenConstraintTest8EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/Validpre2000UTCnotBeforeDateTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest1EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest2EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/ValidrequireExplicitPolicyTest4EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/WrongCRLCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/anyPolicyCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/basicConstraintsNotCriticalcAFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/deltaCRLIndicatorNoBaseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/distributionPoint2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA3cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA4cRLIssuerCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/indirectCRLCA6Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1SelfIssuedsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subCAIAP5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy1subsubCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitAnyPolicyTest3EE.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P12subsubCAIPM5Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping1P1subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/inhibitPolicyMapping5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalcRLSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/keyUsageNotCriticalkeyCertSignFalseCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN1subCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN3subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDN5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsDNS2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsRFC822CA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/nameConstraintsURI2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsAttributeCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsCACertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlyContainsUserCertsCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA3Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/onlySomeReasonsCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCA2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint1subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA0Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA1Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subCA4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA00Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA11Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubCA41Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA11XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pathLenConstraint6subsubsubCA41XCert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/pre2000CRLnextUpdateCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy0subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy10subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2SelfIssuedsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy2subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy4subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy5subsubsubCACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7CACert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subCARE2Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/pkits_SUITE_data/pkits/smime-pem/requireExplicitPolicy7subsubsubCARE2RE4Cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/cacerts.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/client_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/crl_signer.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dh.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key2.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param0.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_param1.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/idp_crl.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_dsa_with_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/openssh_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_cn.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/req.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_ISO.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_cert.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/server_key.pem: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_dsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_ecdsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_rsa_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh2_subject_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_comment_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/ssh_rsa_long_header_pub: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/public_key/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/bin/reltool.escript: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_examples.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/doc/src/reltool_usage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/display_args: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/examples/mnesia_core_dump_viewer: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_app_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_fgraph_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_mod_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_sys_win.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_target.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/src/reltool_utils.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_app_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/y-1.0/src/y3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_manual_gui_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dep_in_app_not_xref/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/dupl_mod/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/ebin/someapp.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/escript/someapp-1.0/src/mymod.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/faulty_app_file/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/x-1.0/ebin/x.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/y-1.0/ebin/y.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/sort_apps/z-1.0/ebin/z.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-1.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/b-3.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_server_SUITE_data/use_selected_vsn/lib2/b-2.0/src/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/reltool_wx_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/test/rtt.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/reltool/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dtrace_user.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/dyntrace_lttng.h: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_file_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/c_src/trace_ip_drv.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/LTTng.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dbg.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/dyntrace.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/erts_alloc_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/msacc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/runtime_tools_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/scheduler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/doc/src/system_information.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/dist.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/driver1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/function-calls.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/garbage-collection.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/memory1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/messages.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/port1.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/process-scheduling.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/spawn-exit.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe-n.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.d: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/examples/user-probe.systemtap: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/include/observer_backend.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/appmon_info.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dbg.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/dyntrace.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/erts_alloc_config.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/msacc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/observer_backend.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/runtime_tools_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/scheduler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/system_information.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/src/ttb_autostart.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_SUITE.c: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/erts_alloc_config_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/msacc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/runtime_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/scheduler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/test/zzz_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/runtime_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/alarm_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/appup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/error_logging.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rb.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/bar.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/ge_h.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs1.3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/gs2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/lists2.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/portc.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sp.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/rel/sup.2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/release_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/relup.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/sasl_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/script.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/doc/src/systools.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/examples/src/target_system.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/info: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/alarm_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/erlsrv.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/format_lib_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/misc_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/rb_format_supp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/release_handler_1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.app.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.appup.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_file_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/sasl_report_tty_h.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_make.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_rc.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/src/systools_relup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/alarm_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/installer.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rb_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/Makefile.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib3/app1-3.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib4/app1-4.0/src/app1_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/aa.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/b.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/erl.ini.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/heart_restart.bat: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/README: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.0/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/ebin/a.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/a-9.1/src/a_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/src/b_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/regexp_appup/app1/ebin/app1.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/start_client: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/rh_test_lib.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.cover: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl.spec: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/sasl_report_suite_supervisor.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/ebin/app1.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app1-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/ebin/app2.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_duplicate_modules/lib/app2-1.0/src/myapp.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl-9.9/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/sasl/ebin/sasl.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/systools_rc_SUITE.erl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/test/test_lib.hrl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/sasl/vsn.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/AUTHORS: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.pl: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.sed: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/bin/snmp-v2tov1.src: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/configure.in: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.fig: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/MIB_mechanism.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/files.mk: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/getnext4.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-2.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-3.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp-um-1-image-8.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_advanced_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_agent_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_a.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_app_b.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_audit_trail_log.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_community_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_config.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_def_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_framework_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_generic.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_agent.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_impl_example_manager.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_index.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_instr_functions.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_intro.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_config_files.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_funct_descr.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_manager_netif_1.gif: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_mib_compiler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_notification_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_pdus.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_standard_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_target_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_user_based_sm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmp_view_based_acm_mib.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_conf.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_discovery_handler.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_io.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_logger.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_error_report.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_local_db.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_data.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mib_storage.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_mpd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_network_interface_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_notification_filter.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpa_supervisor.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpc_cmd.xml: Cannot write: No space left on device\ntar: otp-70a3e70ce4fec9e5d79929aa28aecf4a81980322/lib/snmp/doc/src/snmpm.xml: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n" + ] }, "stable": { "version": [ 22, - 0, - 7 + 1 ], - "commit": "3967d28c05dae77db30b15e56eb4ececf4f1afef", - "sha256": "1jk78b674cvi6fh6fj5jqqnqv4452x9bn6h79yrdm5nws1nh84am" + "commit": "e62a389ce5dd27e7b26802243a5565ffd1feaef0", + "error": [ + "exited abnormally with code 1\n", + "", + "unpacking...\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_syntax_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/erl_tidy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/igor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_tests.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/merl_transform.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/prettypr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/src/syntax_tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/merl_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/m2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_SUITE_test_module.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/syntax_tools_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/syntax_tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/getting_started.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/introduction.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/tftp.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/doc/src/usersguide.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_app.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_binary.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_engine.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_file.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_logger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/src/tftp_sup.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.config: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/test/tftp_test_lib.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tftp/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/depend.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/c_src/erl_memory_trace_block_table.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cover_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/cprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/eprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/erlang_mode_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/fprof_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/instrument.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/lcnt_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/make.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/notes_history.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/ref_man.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/tags.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn1.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.fig: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/venn2.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/doc/src/xref_chapter.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-edoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-eunit.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-flymake.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-pkg.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels-old.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-skels.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-start.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang-test.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erlang_appwiz.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/erldoc.el: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/internal_doc/emacs.sgml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/tags.3: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/emacs/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/examples/xref_examples.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/priv/styles.css: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cover.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/cprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/eprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/fprof.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/instrument.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/lcnt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/make.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tags.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.app.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/tools.appup.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_base.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_compiler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_parser.yrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_reader.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_scanner.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/src/xref_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/a.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/b.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/cc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/crypt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/d/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/v.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/w.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/compile_beam/z.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/d1/e.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/f.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/include_eunit_hrl/cover_inc_eunit.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/included_functions/cover_inc.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_11439/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cover_SUITE_data/otp_6115/f2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/cprof_SUITE_data/cprof_SUITE_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comments: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/comprehensions: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/funcs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/highlight: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/icr: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/macros: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/records: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/terms: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/try_catch: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emacs_SUITE_data/type_specs: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/emem_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/ed.script: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eed.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_suite_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/eprof_SUITE_data/eprof_test.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/foo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/fprof_SUITE_data/fprof_unicode.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/ignore_cores.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/instrument_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/big_bang_40.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/lcnt_SUITE_data/ehb_3_3_hist.lcnt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/Emakefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/incl_src/test_incl2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test4.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test5.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/make_SUITE_data/test_incl1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.cover: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools.spec.win: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/tools_bench.spec: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/depr_r9c.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/dir/dir/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.beam: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/fun_mfa_r14.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/cp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib1.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/lib3.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/lib_test/t.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/x__x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/md/y__y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.beam.v1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/read/read.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.0/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/lib/app2-1.1/ebin/dummy: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/x.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/rel2/y.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.1: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/test/xref_SUITE_data/update/x.erl.2: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/tools/vsn.mk: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/AUTHORS: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/LICENSE.txt: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/README: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gen_util.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_c.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/gl_scan_doc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/glapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_doxygen.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/added_func.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/bugs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxTreeCtrl.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.c_src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxXmlResource.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_extra/wxe_evth.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_cpp.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wx_gen_erl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/api_gen/wxapi.conf: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/Makefile.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/egl_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_fdefs.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/gl_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/glu_finit.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_derived_dest.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_events.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_funcs.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_init.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/gen/wxe_macros.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_callback_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_driver.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_events.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_gl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_helpers.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_impl.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_main.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_memory.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_ps_init.c: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.cpp: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_return.h: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/c_src/wxe_win32.rc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/config.mk.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/configure.in: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/overview.edoc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/book.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/notes.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/part.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/ref_man.xml.src: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/doc/src/specs.xml: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/demo_html_tagger.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/erlang.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_aui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_button.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_canvas_paint.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_choices.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_cursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_dialogs.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_frame_utils.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_graphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_grid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_htmlWindow.html: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_listCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_notebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_pickers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_popupMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_radioBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sashWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_sizers.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_slider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_splitterWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_static.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_textCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/ex_treeCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/demo/image.jpg: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/copy.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/hello2.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/menu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/minimal.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/simple/sample.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_board.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_game.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/sudoku/sudoku_gui.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.ico: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/appicon.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/artprov.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/basicdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/controls.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/custclas.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/derivdlg.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fileopen.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/filesave.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/frame.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/fuzzy.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/menu.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/platform.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/quotes.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/resource.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/stop.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/throbber.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/toolbar.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/uncenter.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/update.gif: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xpm: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/rc/variable.xrc: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/examples/xrc/xrc.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/gl.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/glu.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/include/wx.hrl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/info: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/prebuild.skip: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo128.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo32.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/priv/erlang-logo64.png: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/Makefile: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/gl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/glu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorEntry.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAcceleratorTable.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxActivateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxArtProvider.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiDockArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManager.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiManagerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiPaneInfo.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiSimpleTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxAuiTabArt.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmap.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBitmapDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBoxSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxBufferedPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxButton.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarDateAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCalendarEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCaret.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCheckListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChildFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoice.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxChoicebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClientDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboard.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxClipboardTextEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCloseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxColourPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxComboBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCommandEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxContextMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxControlWithItems.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxCursor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDCOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDateEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDatePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDirPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDisplayChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxDropFilesEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEraseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxEvtHandler.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDataObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFileDirPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFilePickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFindReplaceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFlexGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFocusEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFontPickerEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGBSizerItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGCDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGLCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGauge.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGenericDirCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsBrush.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsContext.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsFont.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsMatrix.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsObject.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPath.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGraphicsRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGrid.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridBagSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellBoolRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellChoiceEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellFloatRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellNumberRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellStringRenderer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridCellTextEditor.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxGridSizer.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHelpEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlEasyPrinting.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlLinkEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxHtmlWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIcon.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconBundle.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIconizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxIdleEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImage.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxImageList.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxInitDialogEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxJoystickEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLayoutAlgorithm.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListBox.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListCtrl.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListItemAttr.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListView.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxListbook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLocale.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxLogNull.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIChildFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIClientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMDIParentFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMask.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMaximizeEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMemoryDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenu.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMenuItem.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMessageDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMiniFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMirrorDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseCaptureLostEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMouseEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMoveEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxMultiChoiceDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNavigationKeyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebook.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotebookEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxNotifyEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxOverlay.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPageSetupDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaintEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPalette.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPaletteChangedEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPanel.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPasswordEntryDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPen.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPickerBase.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupTransientWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPopupWindow.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPostScriptDC.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewCanvas.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewControlBar.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPreviewFrame.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintDialogData.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintPreview.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrinter.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxPrintout.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxProgressDialog.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxQueryNewPaletteEvent.erl: Cannot write: No space left on device\ntar: otp-e62a389ce5dd27e7b26802243a5565ffd1feaef0/lib/wx/src/gen/wxRadioBox.erl: Cannot write: No space left on device\ntar: Exiting with failure status due to previous errors\nerror: program 'tar' failed with exit code 2\n" + ] } }, { @@ -24962,14 +25081,14 @@ "repo": "tom-tan/esh-help", "unstable": { "version": [ - 20170830, - 411 + 20190905, + 22 ], "deps": [ "dash" ], - "commit": "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6", - "sha256": "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs" + "commit": "417673ed18a983930a66a6692dbfb288a995cb80", + "sha256": "0x7d51a6ljl014zy7mi27vzcqqbcwg9z4drq29fr2ajk82mqhlgd" }, "stable": { "version": [ @@ -25252,14 +25371,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20180429, - 1455 + 20190830, + 2116 ], "deps": [ "dash" ], - "commit": "90e451af4daa190d6c0e29fb714b0501a7cce89a", - "sha256": "01jysgdd4im4kf4afzwd4mm8x9vlpibb1w4yi2jvc0hglqddnr2g" + "commit": "98c669e3653bf94c236c54946c6faba7f782ef0d", + "sha256": "1v4s3srn6cc4rbb8hg3wri8c3vnijkyz582qmpyf1vd44mldfq4x" }, "stable": { "version": [ @@ -25402,14 +25521,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190814, - 1054 + 20190917, + 917 ], "deps": [ "julia-mode" ], - "commit": "5b12e56a52144b2393858236e56e1c5ea828b753", - "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj" + "commit": "8b48aae3567e7af6d8a84dfe3b017cb099d3414d", + "sha256": "0b8n2f7lkgxr498106lhwcldvq0xjhbxmh3xqgy4jp8v0rhh6rli" }, "stable": { "version": [ @@ -26042,28 +26161,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190828, - 2159 + 20190916, + 214 ], "deps": [ "cl-lib", "evil" ], - "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028", - "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w" + "commit": "74e098f79cfb9e8e6391c526154d881c602a90ae", + "sha256": "1gqwb9i0iy08gsp8yg75gmcdxmis102jcr1nsfszjv4zrmhiswnm" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "cl-lib", "evil" ], - "commit": "733f8d0d289fcbb58705acd1049b618826a3c011", - "sha256": "01hr5wf693s2djs6l83nfpq6wyyws99c5nwil6hpqhvrwp4f5h95" + "commit": "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22", + "sha256": "172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz" } }, { @@ -26574,15 +26693,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20190620, - 153 + 20190904, + 1730 ], "deps": [ "evil", "magit" ], - "commit": "6a32e4359cbd2803bafb7134cb6df312644ac986", - "sha256": "0i8xpa6vr30vjy3iilcx9g65srrprg1igk3f4xp6lwcc6pkc2mbj" + "commit": "4b66a1db8285457147a5436f209391016a819ea1", + "sha256": "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h" }, "stable": { "version": [ @@ -26636,26 +26755,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20190808, - 1056 + 20190920, + 58 ], "deps": [ "evil" ], - "commit": "43be86d8c41841a20733718d177e8299d5379218", - "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" + "commit": "1027459d44ced4daed84247770ce9ae2b5fd1993", + "sha256": "18824dx00w9wnbqsra3y18sxrr6r4vgj8h3mxa3n1dn14i72sjgm" }, "stable": { "version": [ 2, 3, - 3 + 4 ], "deps": [ "evil" ], - "commit": "43be86d8c41841a20733718d177e8299d5379218", - "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" + "commit": "5e92e374e6b46176d46323b884c25c44063331da", + "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az" } }, { @@ -26666,15 +26785,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20190321, - 1606 + 20190916, + 348 ], "deps": [ "cl-lib", "evil" ], - "commit": "5205fe671803465149e578849bbbe803c23a8e4e", - "sha256": "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42" + "commit": "1cabb869fe70cef49f7dc06f015c3ade1a969c8c", + "sha256": "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb" }, "stable": { "version": [ @@ -27522,14 +27641,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190818, - 2331 + 20190906, + 538 ], "deps": [ "evil" ], - "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a", - "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng" + "commit": "1931e3ea2c64b4aec393a9c25063c330deff55e3", + "sha256": "12p9lfxscs182vbd4dy0m5gacs3d4kyprbz5yndpwvl8g2qsqplz" } }, { @@ -27731,11 +27850,19 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190828, - 1542 + 20190911, + 1319 + ], + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -27746,14 +27873,25 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190825, - 335 + 20190911, + 1315 ], "deps": [ "ewal" ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "ewal" + ], + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -27764,15 +27902,27 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190828, - 1542 + 20190911, + 1305 + ], + "deps": [ + "ewal", + "spacemacs-theme" + ], + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -28050,11 +28200,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20180105, - 621 + 20190917, + 1031 ], - "commit": "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5", - "sha256": "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w" + "commit": "848ad0084f27b92d1cf98dabffbad29f959a642d", + "sha256": "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c" } }, { @@ -28111,16 +28261,15 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20190511, - 614 + 20190919, + 1238 ], "deps": [ - "dash", "f", "s" ], - "commit": "7aa008cb54e7935183a19d6b81d218de7ec38ca4", - "sha256": "0zp0sdnrb5mm6k1z6zqs7s042f6n24sg1y0wx6bw35za6r5f36cr" + "commit": "c77b0397b80d772c98fcc34c9ab131a8350fbf40", + "sha256": "08lhsjmibgvd4cjrvyxhwn7cqrpd83bgsvh2xqppi9mnw1xwgzd5" } }, { @@ -28274,14 +28423,14 @@ "repo": "wasamasa/eyebrowse", "unstable": { "version": [ - 20190827, - 1828 + 20190917, + 1653 ], "deps": [ "dash" ], - "commit": "d75e37a048718d6981c366c431b93ccbe884f356", - "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" + "commit": "e0f6bdf3fc1eab2f036952721a7496e408ce860d", + "sha256": "10fwxryisgpyyxhcz8p2g3h085hd6j6qw1hi5pz70a94d3syr3ws" }, "stable": { "version": [ @@ -28884,11 +29033,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20190807, - 17 + 20190921, + 359 ], - "commit": "7f146605feeeebdf5452450662e2f3bc1e435e6f", - "sha256": "0yr6f2gzgprkqhc22mq64mn119aljihziix712kk1vq59yx2l22f" + "commit": "686e4d28a8abeb1fa05cb21e14c4f0cc12217d63", + "sha256": "0wis927rya6v2mzyvsnjca1b2a1vrndlb7nskkgxs0ssvsvv68bn" } }, { @@ -29118,14 +29267,14 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20190720, - 313 + 20190914, + 524 ], "deps": [ "ivy" ], - "commit": "85f0fc4ab29e4339732c19be314a4920888803b2", - "sha256": "1skjbh7m0cck2rwmgzrrds51gipqf1jqghyfx15drc1n6kwivx3h" + "commit": "79baa7026803b3d877857493da3041ddf6eed050", + "sha256": "0q5lcfg7bpid8rl04c9qml062pyi6sqgdcvhrqxm9mcfyjq5zg72" }, "stable": { "version": [ @@ -29373,11 +29522,11 @@ "repo": "Ambrevar/emacs-fish-completion", "unstable": { "version": [ - 20190429, - 822 + 20190904, + 254 ], - "commit": "e5b9b65a077319dfdb2faca9ef847db3ef55d0db", - "sha256": "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021" + "commit": "0a9a63e2cac24bfdf7dbedb5c6ab7faca23d3bfe", + "sha256": "1rp5y1hpdr08v374cvkqjb2i47lni0yl866wssm73ch9ql30y22n" }, "stable": { "version": [ @@ -29882,11 +30031,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20190729, - 444 + 20190919, + 910 ], - "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", - "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd", + "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14" } }, { @@ -29904,8 +30053,8 @@ "flutter", "flycheck" ], - "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", - "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + "commit": "58ac1e19e50f9c65869c141ef9d44a70a36994bd", + "sha256": "024gwfjin41dxdfmx78s7w10sk4lqjlk8p5j7asddk426pmd2a14" } }, { @@ -30015,8 +30164,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190828, - 1147 + 20190913, + 1456 ], "deps": [ "dash", @@ -30024,8 +30173,8 @@ "pkg-info", "seq" ], - "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52", - "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db" + "commit": "0006a59259ebd02c9199ddc87f0e3ce22793a2ea", + "sha256": "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1" }, "stable": { "version": [ @@ -30910,8 +31059,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20181207, - 1646 + 20190907, + 2035 ], "deps": [ "dash", @@ -30920,8 +31069,8 @@ "let-alist", "seq" ], - "commit": "32ddff87165a7d3a35e7318bee997b5b4bd41278", - "sha256": "10pgsbagq6qj4mshq5sypv0q0khck92b30sc793b4g1pfpsxvgjn" + "commit": "4b585264826a9f0f35d121dd52aa0e381f336d69", + "sha256": "1cz8yxb06acm77jlr0mk9kx79v6pnhb97p2601pik9rndr824c2a" }, "stable": { "version": [ @@ -31541,14 +31690,14 @@ "version": [ 0, 3, - 1 + 2 ], "deps": [ "flycheck", "phpstan" ], - "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183", - "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j" + "commit": "de74ebfcbce53a08daf95d324d7447dede094222", + "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" } }, { @@ -31801,8 +31950,8 @@ "flycheck", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -33595,11 +33744,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190829, - 1514 + 20190904, + 1257 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -33676,8 +33825,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190820, - 826 + 20190909, + 2017 ], "deps": [ "closql", @@ -33689,8 +33838,8 @@ "markdown-mode", "transient" ], - "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908", - "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1" + "commit": "4424101b416931abc1b838e48f5710bd933c2973", + "sha256": "0rbvmj265v75q76x1qvvyz313h6ww7kh3s8w318vghrnylj6za0y" }, "stable": { "version": [ @@ -33745,14 +33894,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20190830, - 1152 + 20190911, + 2017 ], "deps": [ "cl-lib" ], - "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba", - "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh" + "commit": "15a33a9b62d7ac0580c722ee4a7130bd67ba9b49", + "sha256": "16zka3dcxzn25ig8fg06lhiv453pnyqp791hald4r90v46p4x7qq" } }, { @@ -33869,6 +34018,30 @@ } }, { + "ename": "fountain-mode", + "commit": "12589d1eb14bfc87d2e6f2a5ff8f5fb66b574a56", + "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840", + "fetcher": "github", + "repo": "rnkn/fountain-mode", + "unstable": { + "version": [ + 20190913, + 637 + ], + "commit": "f663ea2cfea24bf17ca539bd7ffe844351b7efe8", + "sha256": "0svmsia57dbakdcyjx3435n0vwlrh548j21d5mrgm788dkn668nv" + }, + "stable": { + "version": [ + 2, + 7, + 3 + ], + "commit": "5fe797ebea7544749bc212c77780942329a1ff70", + "sha256": "1ghck97vv2ygqbwgwxgbzb0wvf87w0i6vff47lzmmr2ig1ggw2yb" + } + }, + { "ename": "fraktur-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k", @@ -34061,6 +34234,25 @@ } }, { + "ename": "frecentf", + "commit": "64d342c3814721f82dee8859d90b2da4192d8bc8", + "sha256": "1z20035iplkjan3nf3lr0jzdz6jh988rq281zbi4a5l271ll8lb9", + "fetcher": "git", + "url": "https://git.launchpad.net/frecentf.el", + "unstable": { + "version": [ + 20190903, + 2109 + ], + "deps": [ + "frecency", + "persist" + ], + "commit": "b32eb159de14b2e0d1d1c763acd65cc6784756ae", + "sha256": "15pskn85dmm7dblp56b0zzby9wbc2kysb7n3q07yp8680z6lnxhg" + } + }, + { "ename": "free-keys", "commit": "55067e899ba618d4394ad9657322c92a667a0774", "sha256": "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj", @@ -34279,8 +34471,8 @@ "deps": [ "cl-lib" ], - "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f", - "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77" + "commit": "5f1f2a00d61ea45c6114e6be333f4eeb3d85420c", + "sha256": "031rh3cqv3hmgf8jjgal9hnsj655bsrh4a2p0jr1fr9zvgzc7v27" }, "stable": { "version": [ @@ -34454,8 +34646,8 @@ 20190810, 507 ], - "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", - "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + "commit": "f4e30922952470984460d6617e35939aa97640dd", + "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z" }, "stable": { "version": [ @@ -34816,11 +35008,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190826, - 1736 + 20190905, + 2337 ], - "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6", - "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v" + "commit": "f76340bd11dc6eb5cf6c22cb5f39e76d52b15d66", + "sha256": "0si9d2xcxwkf9l6sly3cckyzlrvr67ihijffjmaswbx7qkgb7gk1" }, "stable": { "version": [ @@ -35498,8 +35690,8 @@ "dash", "with-editor" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "5c424142704d481faafce7b834af67c1aca98e68", + "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c" }, "stable": { "version": [ @@ -37183,8 +37375,8 @@ "cl-lib", "go-mode" ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374", + "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2" }, "stable": { "version": [ @@ -37276,11 +37468,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190819, - 2109 + 20190917, + 1943 ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374", + "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2" }, "stable": { "version": [ @@ -37384,8 +37576,8 @@ "deps": [ "go-mode" ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374", + "sha256": "1jrlcz940y8hpizsy7byimyc9drl3myfym1pg4sg374jrr1y8nz2" }, "stable": { "version": [ @@ -37632,8 +37824,8 @@ 20180221, 2015 ], - "commit": "959b441ac422379a43da2230f62be024250818b0", - "sha256": "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck" + "commit": "414d861bb4acf565ff8cb05f9906a2283b7dc75a", + "sha256": "1ixb7c3vv8ky7gk9kpknv4hg0wgk6xfcbxxrmql9vc16g6jvcspy" } }, { @@ -37677,8 +37869,8 @@ 20180130, 1736 ], - "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1", - "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id" + "commit": "5651966e0275572a9956199418d89c9ccc7b2b1a", + "sha256": "10lxzkz031lazd9zs3pwh2j7723gzpbhr564vsk1r4gdcbbbj2h3" } }, { @@ -38051,8 +38243,8 @@ "magit-popup", "s" ], - "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1", - "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1" + "commit": "31565d975e8c13d4577f4fa705d897ed5da2d524", + "sha256": "00sdbwgn4fqbkahwyys3ffdppckbd9pikwjdwh6bpm6s70lpkf98" }, "stable": { "version": [ @@ -38665,20 +38857,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20190820, - 1726 + 20190909, + 1939 ], - "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a", - "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd" + "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31", + "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "7777b694751c0da754712b964052617de1740e42", - "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2" + "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31", + "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py" } }, { @@ -39032,8 +39224,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20190507, - 1711 + 20190913, + 1624 ], "deps": [ "bui", @@ -39042,8 +39234,8 @@ "geiser", "magit-popup" ], - "commit": "11e0dbf6491300d250efb3dc09d634b01e86b35b", - "sha256": "0j60v0h850cwxik1mhlnmqms47dkkqcnfx53qs66hi1zyp7pax5z" + "commit": "24918011d2f1a78d63f39bf0c462b7dab190629a", + "sha256": "1maag50nbgwygc6w7lbna1ml20f3k4dvxzjm3fgdqmfypi5ag891" }, "stable": { "version": [ @@ -40001,16 +40193,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190830, - 1604 + 20190920, + 637 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", - "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" + "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc", + "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l" }, "stable": { "version": [ @@ -40267,8 +40459,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190814, - 1056 + 20190918, + 1116 ], "deps": [ "biblio", @@ -40279,8 +40471,8 @@ "parsebib", "s" ], - "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", - "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" + "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", + "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" }, "stable": { "version": [ @@ -40855,14 +41047,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190830, - 635 + 20190917, + 551 ], "deps": [ "async" ], - "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", - "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" + "commit": "cfa42e9f94260887d5a54b3c2356d61903f424bc", + "sha256": "0lwhs7wlq2w698ipfjpfb0r2arkalrn8a21qdjnx3lvs4b2jj72l" }, "stable": { "version": [ @@ -41400,14 +41592,14 @@ "repo": "elpa-host/helm-file-preview", "unstable": { "version": [ - 20190825, - 247 + 20190903, + 331 ], "deps": [ "helm" ], - "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432", - "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8" + "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203", + "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f" } }, { @@ -41444,8 +41636,8 @@ "cl-lib", "helm" ], - "commit": "0ad34b7b5abc485a86cae6920c14de861cbeb085", - "sha256": "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs" + "commit": "b290734807ee68e7a7aface2af781d86e1fd5950", + "sha256": "02m05fy5qf5xfd5dh402pibbzwzmcfgqymqigkbdfyjbfbljl3zx" }, "stable": { "version": [ @@ -41550,17 +41742,17 @@ }, { "ename": "helm-frame", - "commit": "febb2599e50518dadb30088bc9576aea2af092a7", - "sha256": "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i", - "fetcher": "gitlab", + "commit": "8bbb56b883658fdf91b984c01d2472bdf6787003", + "sha256": "1hmml0209z3ap35bqk9b1fh0lcfksysqszgj1ifh1mdjz81xx9sq", + "fetcher": "github", "repo": "chee/helm-frame", "unstable": { "version": [ - 20170515, - 1950 + 20180604, + 1005 ], - "commit": "389e6461a423d649b7062ba99a2234bef7770059", - "sha256": "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987" + "commit": "485e2a534b0de5e8dbeb144a9a60ceca00215a4a", + "sha256": "1hxqyyh8jzk83ppi1p5r9b9gy7k2hanh3xzp129iw9yqpmvwmsnq" } }, { @@ -41578,8 +41770,8 @@ "fuz", "helm" ], - "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", - "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + "commit": "f4e30922952470984460d6617e35939aa97640dd", + "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z" }, "stable": { "version": [ @@ -41614,6 +41806,25 @@ } }, { + "ename": "helm-fuzzy", + "commit": "e0172c8a4e2393a0263373c80e6e7f654bf74dc6", + "sha256": "1f7lj9prgh0wpf8xmy5xi5rhs5pj3j4lz68apd95nv2idnbrrlb7", + "fetcher": "github", + "repo": "elpa-host/helm-fuzzy", + "unstable": { + "version": [ + 20190905, + 526 + ], + "deps": [ + "flx", + "helm" + ], + "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7", + "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9" + } + }, + { "ename": "helm-fuzzy-find", "commit": "34f76bb377ed31aa42663858c407cc5476e6fe1f", "sha256": "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i", @@ -42331,8 +42542,8 @@ "helm", "lean-mode" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -43514,8 +43725,8 @@ "helm", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -43792,15 +44003,15 @@ "repo": "wandersoncferreira/helm-spotify-plus", "unstable": { "version": [ - 20190807, - 2115 + 20190913, + 2236 ], "deps": [ "helm", "multi" ], - "commit": "e52233523917596dd3862e1151a027ce89a80a38", - "sha256": "0h4lj18rvhwcsb0k7ckp81h1aank9pf0dsa3qb578n10i9p6bb4y" + "commit": "c3922ec368250965e483876cde5880d88a40a71b", + "sha256": "12zl775l7zikv268vypnb56ly2h0y3sf5wxv5rc2amnmwgrikvra" } }, { @@ -44149,14 +44360,14 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20190821, - 1252 + 20190916, + 1544 ], "deps": [ "helm" ], - "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad", - "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b" + "commit": "316e1bdb877ec4634addc422cdb9572ee3e2afe0", + "sha256": "14zgww1qyk7cp80p6f3viljjbibm3h0c51alplrmjdng57xy0wgq" } }, { @@ -44327,25 +44538,26 @@ "repo": "jjzmajic/hercules.el", "unstable": { "version": [ - 20190820, - 1712 + 20190920, + 518 ], "deps": [ "which-key" ], - "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4", - "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7" + "commit": "e6fcb0df3fe877bec2d708f4d034da685d8a1081", + "sha256": "0i1bza4nj01z23ig340svyr0lcl284lcpg1lpnhc7cmybjlv27nl" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], "deps": [ "which-key" ], - "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a", - "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g" + "commit": "489ed27f978c8ae7ce0587d4677ef14d59776008", + "sha256": "19939pf5d6p2facmfhpyghx0vipb5k6ry3bmkmjfkj1zp132zfqf" } }, { @@ -44576,17 +44788,17 @@ }, { "ename": "highlight", - "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b", - "sha256": "11icn6f46synw6xvs2a266g43fvpnz8i7d7dyr0iywzjpbpyhsd2", - "fetcher": "git", - "url": "https://framagit.org/steckerhalter/highlight.el.git", + "commit": "38433e95f73ab20f27254a084d0b245c6e62d882", + "sha256": "0ik2kci2y404zzvs78h74v21ssgi6f0jdzzbq45fhdhjra02kzzz", + "fetcher": "github", + "repo": "emacsmirror/highlight", "unstable": { "version": [ - 20181002, - 1151 + 20190710, + 1527 ], - "commit": "ea733e17884aeae19172407e20559fc693fdd3a7", - "sha256": "13ajbhpwvdmk0mzaffj45gxqmq13b57d81iqdpg9q2l2wjk95jq7" + "commit": "9258a2b8362d737115cbd87618f947eadb140411", + "sha256": "0pbqzgbfkm8smi23j94hirxh2r1yc0ipyjbbv1y906br6bx5c1a8" } }, { @@ -45248,11 +45460,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20190807, - 1831 + 20190918, + 2149 ], - "commit": "be57dbc5a4667e4a60b8249b53fa176db1019c8e", - "sha256": "12swld4a723wqkh5h9jf3l4lj5rsidgmna53n8g48w8qvi2gz8l8" + "commit": "d7673363ef318a417adc28e36cafb78d01a671af", + "sha256": "11d7kmgdpjmjlnfkhfhwvwjdjaag0iscscdbg6gf1hkch19055cp" }, "stable": { "version": [ @@ -45558,6 +45770,26 @@ } }, { + "ename": "howdoyou", + "commit": "eb5356c3e094e93c09398bfd628b1594c7e3ec20", + "sha256": "0dnlhkpnjag6vk7qyfgzc7p0fs1b01pc3dnm6bgw19ghdp1wvp8y", + "fetcher": "github", + "repo": "thanhvg/emacs-howdoyou", + "unstable": { + "version": [ + 20190916, + 1812 + ], + "deps": [ + "org", + "promise", + "request" + ], + "commit": "b84874a58c2301bc4c80155a9552eaad1e026b4b", + "sha256": "0ssx3zibsqf66biv7gypgi3i29pkmpgy8f5ydynl03m5ix3f2b86" + } + }, + { "ename": "howm", "commit": "0099a1f9b0efb3fc3a1420cfe71a647ec6458998", "sha256": "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn", @@ -45607,8 +45839,8 @@ "deps": [ "dash" ], - "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69", - "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2" + "commit": "3c1f3b527da6ad1b219d64957257acb22971cd73", + "sha256": "0mdg9v9vqjprqp6qbn8rk60b4dr6fam2p0g078zkw9092cvbzzmj" }, "stable": { "version": [ @@ -45660,15 +45892,15 @@ "repo": "plexus/html-to-hiccup", "unstable": { "version": [ - 20161028, - 1401 + 20190909, + 1549 ], "deps": [ "dash", "s" ], - "commit": "99217a5058626d253ed8ada51a7642071fe54ba5", - "sha256": "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i" + "commit": "50a52e2b0d13d865187acdf775b8203d5003f2f1", + "sha256": "1qi092mw2n08v6yr0j6hlpx0pnlcnhxjqbsrlw9pn4yin6zk91yp" } }, { @@ -46078,14 +46310,14 @@ "repo": "ieure/hyperspace-el", "unstable": { "version": [ - 20190702, - 2331 + 20190908, + 550 ], "deps": [ "s" ], - "commit": "6441da7a816b4bf6faba21cb7b8cc1a1db6f35d5", - "sha256": "10l82fzp7m57bkzbqgmz1sp42mqkcmz4i6w9rv2hpzdp7ccgfr9v" + "commit": "825ac47887bf2f63e7dc2ecce264a52d9f0fae70", + "sha256": "00bjwgg67y6igm2k2rwrw4n35jiw5akhl01mhbggwy999gb01cg2" }, "stable": { "version": [ @@ -46559,8 +46791,8 @@ "memoize", "s" ], - "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a", - "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa" + "commit": "fcb6fa0c2f5989b2e79f2dc1ef57d03e455cce44", + "sha256": "1wq5gbr87f6c3bbsndkg50ndf6s21pzz49dmxaa4sckjs2ax9mzx" }, "stable": { "version": [ @@ -47624,17 +47856,18 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20190715, - 1457 + 20190830, + 2019 ], "deps": [ "company", "js2-mode", "js2-refactor", + "json-process-client", "seq" ], - "commit": "971e310b8eec87afbf1f9bf927e12848deb1c058", - "sha256": "1rllgalxa73dcgmakbly23m8iwhszq44hnjpkwx5hn11zfdgx0wx" + "commit": "ded54e3b278a9358a15927b3085ea64562fbf2e6", + "sha256": "1dmdlm913rkxvhqj42n2mnqyay73y8ka6xdrs0w8xgq1r508iqmn" }, "stable": { "version": [ @@ -47991,11 +48224,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20190816, - 715 + 20190907, + 1024 ], - "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac", - "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk" + "commit": "f6f148eebef72939b90a1822c1c3a257e22f802e", + "sha256": "0jxh9plw699b7w6vi6km4154ixgn5w8a1hx9v99s0icf8rpvrcnw" } }, { @@ -48235,16 +48468,16 @@ "repo": "commercialhaskell/intero", "unstable": { "version": [ - 20190530, - 1308 + 20190919, + 216 ], "deps": [ "company", "flycheck", "haskell-mode" ], - "commit": "61caa798bd385acf918b3639cf03f336b618e78b", - "sha256": "0s6ik53anwljd858xs69awx42v70ifl3pcq8njx0msfqd4qalhlx" + "commit": "bab8e85b1aea9b03dfe05048bcdc0395e05e9b20", + "sha256": "19zl7dydg2lf8msl2ls9r85f4xw3x2796w5j4h7dxxz6flljhhby" }, "stable": { "version": [ @@ -48688,8 +48921,8 @@ "deps": [ "pythonic" ], - "commit": "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf", - "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z" + "commit": "a0f6be09b92dff312b6ef9bec30f58cd8ada9623", + "sha256": "14hd6hbvsabrmqd44l2l598bib636wn2mzvpdwg61wjrbsd2czyy" } }, { @@ -48848,8 +49081,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190814, - 1056 + 20190918, + 1116 ], "deps": [ "biblio", @@ -48860,8 +49093,8 @@ "s", "swiper" ], - "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", - "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" + "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", + "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" }, "stable": { "version": [ @@ -48890,15 +49123,15 @@ "repo": "wandersoncferreira/ivy-clojuredocs", "unstable": { "version": [ - 20190810, - 258 + 20190907, + 2053 ], "deps": [ "edn", "ivy" ], - "commit": "7af9cef998a608a7f505120af4754779f3014106", - "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m" + "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554", + "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i" } }, { @@ -48942,8 +49175,8 @@ "repo": "s-kostyaev/ivy-erlang-complete", "unstable": { "version": [ - 20190406, - 1736 + 20190910, + 426 ], "deps": [ "async", @@ -48951,8 +49184,8 @@ "erlang", "ivy" ], - "commit": "f3a7088ba62746932ac0084e254e4235b93febcc", - "sha256": "0sdxcx1ihb51khi5chdm80mzwh8ygfs86pndgh5gq8dzbqpi2ax4" + "commit": "fb2e31863cb0305bb3e16c094d29ff78a7414603", + "sha256": "0p16lxaana6zb2dlci3d6wwslcw4pifvnmhf3ymbhccmc36v5yqi" }, "stable": { "version": [ @@ -48978,14 +49211,14 @@ "repo": "clemera/ivy-explorer", "unstable": { "version": [ - 20190722, - 845 + 20190909, + 1921 ], "deps": [ "ivy" ], - "commit": "cb41a9e5df1cfad5877ab5429b9250e7ba082e4e", - "sha256": "0svlix3sr2jlr5awdvism1akmnca0vn0mq072s38w1q19q461cii" + "commit": "a413966cfbcecacc082d99297fa1abde0c10d3f3", + "sha256": "1720g8i6jq56myv8m9pnr0ab7wagsflm0jgkg7cl3av7zc90zq8r" }, "stable": { "version": [ @@ -49279,27 +49512,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190728, - 1607 + 20190921, + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -49378,8 +49611,8 @@ "ivy", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -49708,11 +49941,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20190605, - 443 + 20190917, + 124 ], - "commit": "d5555cc83c1893a1c0ea04d48857d5e71b138c06", - "sha256": "1lzs5zh4ipvyxi5vzbcpxrdjrrb0vddbcajzcbsi0784cs3ndzkk" + "commit": "349eba576455f1c8f40acaa77ef222bf6432c4e7", + "sha256": "0c0idb1rfp7n99jq1jmjvgmv77f38jrvxjy95lx27j743i8zkb7d" } }, { @@ -50311,14 +50544,14 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20190720, - 1329 + 20190917, + 1733 ], "deps": [ "request" ], - "commit": "9e3c238d96a98d6d156dbb38dcbaecf1450b9d2e", - "sha256": "1332jnn63wl00l9701qvjx9z6sxisygvn9bz366yhiq2racfrgb4" + "commit": "3d3fb0a65260a267123cddf52ee100561ef504fd", + "sha256": "0a6x1d6h85b14wfhmnmss9cvbkalfjmybq7bm1187g3afg3ycy7g" } }, { @@ -50613,6 +50846,24 @@ } }, { + "ename": "js-react-redux-yasnippets", + "commit": "b5eef6590b2070ab46a5ab216cdcc6ab82174e47", + "sha256": "1mkcgpca4kzs31p0r5iwplwsm8jmf8w6h1v1a7qvpqan3gj7kidb", + "fetcher": "github", + "repo": "sooqua/js-react-redux-yasnippets", + "unstable": { + "version": [ + 20190911, + 1259 + ], + "deps": [ + "yasnippet" + ], + "commit": "70785d126a28ffcb314fb4b354319418586e06b1", + "sha256": "0adlnjkcq0kpadc1dqwfzrrk0xd4jc0rc4k8hbj6nh4dhc7shnk0" + } + }, + { "ename": "js2-closure", "commit": "61bf3e70ae38a78184f0b373ff6f0db234f51cb2", "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7", @@ -51121,20 +51372,20 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20190828, - 1646 + 20190908, + 1717 ], - "commit": "94761603d368f05eaed3573312503db940f4edfe", - "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj" + "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", + "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "6eb58ef8b2e922e042fb0aee399547291fce06a4", - "sha256": "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf" + "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", + "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" } }, { @@ -51287,8 +51538,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190828, - 2043 + 20190917, + 1642 ], "deps": [ "cl-lib", @@ -51296,8 +51547,8 @@ "websocket", "zmq" ], - "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64", - "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg" + "commit": "dcf80d51dbf9c8eea9679d5a54ca771221d6a1e0", + "sha256": "02zjnyw8x4dy9il9ans2c9mhz4lj6ni1s1brgbsbydkli1xavdhm" }, "stable": { "version": [ @@ -51580,16 +51831,30 @@ "repo": "magnars/kaocha-runner.el", "unstable": { "version": [ - 20190826, - 916 + 20190904, + 1950 ], "deps": [ "cider", "parseedn", "s" ], - "commit": "5973bf9619d8c8b8f69824246210f31ea644127b", - "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax" + "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e", + "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "cider", + "parseedn", + "s" + ], + "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f", + "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3" } }, { @@ -51820,8 +52085,8 @@ 20190721, 1357 ], - "commit": "a243f0e0fdc9ee2b22ee19594de0c3b966b2445f", - "sha256": "0pzppcxzspx1k6r7vd88fn56r21d0g1jvq4w0ymlzm63vwda4p6i" + "commit": "f4a27da3c09dbee62d63dd756bc44652f6319692", + "sha256": "1bw3ywjv49bmkxkcjfr8pnshy2kxklfx253cd1qaplw1g28d0plb" } }, { @@ -52252,8 +52517,8 @@ 20180702, 2029 ], - "commit": "cefc5a72118021e01660734d08d1ad2433c7131e", - "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw" + "commit": "72ac4e8f56a4ee432c9279cab044829beda22469", + "sha256": "0mvc71lxsx7wjkbravsj09zc5bhbq55hk1d0phwvzvjc271h38wy" }, "stable": { "version": [ @@ -52273,14 +52538,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20190811, - 1116 + 20190904, + 1248 ], "deps": [ "cl-lib" ], - "commit": "d2ae3386b52a25c080d8502fc19207d997676cd2", - "sha256": "0fsndh8nwpmnbv505r26cxxgxx8wlvx9h8pgb95im6q6pj2g7p9x" + "commit": "878b02be15ea9aebe939189fd10598b057b739af", + "sha256": "18g1jid2z6gls4ijgz3k8b5gaij3fs5rwrn0i8bgly6jmk6nx8rp" }, "stable": { "version": [ @@ -52439,11 +52704,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20190116, - 2055 + 20190917, + 1807 ], - "commit": "0e542ae2f78420618df8b0123dfe168a37dce333", - "sha256": "1rv3vxw3dx477sapfd0hj3pkl3x0sihdsyl671azbcr02z67xl6p" + "commit": "d6720fe9bc2ce447f213c470bd18fad8e04dc18b", + "sha256": "093yirwm3w0z2x0f07kggivkvgcaqhkar0fqbfagd9nly2f0jzr2" } }, { @@ -52695,8 +52960,8 @@ 20190320, 1827 ], - "commit": "d32477943ff6a2ea158c560a7b0c67537432bc2b", - "sha256": "1mlpdma7s4q54k54740q7r0ykkhkr3avxq8h5zmirc3lib7rrxv0" + "commit": "17a21954725eae3bf7b77f724d7783936eb33742", + "sha256": "0q1j5h4nxpckfd5apwl4iqhgdnjpy2fjf9kqfknyiz7c7h7424d0" } }, { @@ -53127,20 +53392,20 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20190828, - 1538 + 20190917, + 1451 ], - "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d", - "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i" + "commit": "31df91362e8e14e51ba3c16ea17d914e7c3986e1", + "sha256": "1zl6qkn6cd5f85d7w03w3az7s7dmz0jp3g6w1pwwhdf76dcw3lhx" }, "stable": { "version": [ 3, - 3, + 5, 0 ], - "commit": "cecaaed04bd0f756b3ac98922768d61229ed2322", - "sha256": "1d70dfqlr5j2d5ns16dbdibhyfm6ss0khcj7hang3rhyiyrhpkra" + "commit": "c8ca1ecc892229dc16019fe3a7eb98a7307e746f", + "sha256": "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d" } }, { @@ -53151,14 +53416,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20190816, - 1859 + 20190911, + 1658 ], "deps": [ "leaf" ], - "commit": "c314c8295973f75034f0dc2946b18087d3408e66", - "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7" + "commit": "29cae76ea7817fe3719f4ebf6751cf434567e4d0", + "sha256": "0qsmixhn7jjlzxnxjs77nmyzqh6q0q9ssgjj7gnp3i4llv2jlj3y" }, "stable": { "version": [ @@ -53178,8 +53443,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20180906, - 1645 + 20190914, + 958 ], "deps": [ "dash", @@ -53188,8 +53453,8 @@ "flycheck", "s" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -53270,11 +53535,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20190811, - 2340 + 20190901, + 1439 ], - "commit": "0114525803860b18a34624339825219bb6b8943e", - "sha256": "04di2f51i0gqvwj8x2wn1f85a4iyg6gf8hkig4z244j8jv489v6d" + "commit": "5067e40805c40e83424d206584838ffa8c8117c7", + "sha256": "093gbki5cvjscrl77nabh845axkxczqwbamwb4svc7wcky5xlpmx" }, "stable": { "version": [ @@ -53309,16 +53574,17 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20190827, - 1032 + 20190910, + 221 ], "deps": [ + "aio", + "dash", "graphql", - "request-deferred", "spinner" ], - "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23", - "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf" + "commit": "044fd1cd0bc727d888b424ffc5a81b22c7b802c1", + "sha256": "1i9wbbymdfjyz6z0vd5bl1c733pbfcf5cf1shl98s54sg5lq0p89" } }, { @@ -53492,11 +53758,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20190829, - 921 + 20190831, + 1008 ], - "commit": "69ab5c2db93cf58a57354a5d78e825d191109717", - "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5" + "commit": "026da5d614864a60bb151f0e75240a938e41923b", + "sha256": "008ynbzcszsbyj3pi9cm6ig1ks059xprkyhd74dnw8grlddwfimd" } }, { @@ -53540,8 +53806,8 @@ 20170121, 1254 ], - "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", - "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" + "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a", + "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if" }, "stable": { "version": [ @@ -53553,6 +53819,36 @@ } }, { + "ename": "libbcel", + "commit": "31f4cbd89473f48ad6b4cc78028e8c51f1ee95a7", + "sha256": "03sfd2af54cm53hh8k3d0b9jy7cj4f1hgd93wqvqi7bbcz91krg2", + "fetcher": "github", + "repo": "DamienCassou/libbcel", + "unstable": { + "version": [ + 20190919, + 1948 + ], + "deps": [ + "request" + ], + "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", + "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "request" + ], + "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", + "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + } + }, + { "ename": "libelcouch", "commit": "209d5c507cfe42b152c21a4534c3ba549186420f", "sha256": "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p", @@ -53620,20 +53916,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20190827, - 1905 + 20190918, + 1609 ], - "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", - "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" + "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc", + "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik" }, "stable": { "version": [ 1, 1, - 0 + 1 ], - "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", - "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" + "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc", + "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik" } }, { @@ -54042,8 +54338,8 @@ "evil", "lispy" ], - "commit": "e5e6cddb2cff93ee19f34d5dde8f46d010a90dad", - "sha256": "1v07s2l3pww30rsmq4dp4nxwmkz7cvdgfbjsyfxkny4i87v5figz" + "commit": "56198f1c4488a52a0d0512c717dff36e8b9fbfd0", + "sha256": "1zrhn5pgjvwprwnsr85zs4rhs7mijyq3wbd5s0ff96m9n1dbj6vp" } }, { @@ -54974,8 +55270,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20190817, - 1436 + 20190918, + 1601 ], "deps": [ "dash", @@ -54986,8 +55282,8 @@ "markdown-mode", "request" ], - "commit": "ccc40d3249c031e34fec13d4b82da694addb0274", - "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9" + "commit": "df3cfc30eaa9d7605ac3db5d17d8a02efaf50527", + "sha256": "0whybqasbi09ki9714k139vm0hmzvxrn0r20ibk8rfj6lxprkwl5" }, "stable": { "version": [ @@ -55034,8 +55330,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190828, - 1641 + 20190918, + 1903 ], "deps": [ "dash", @@ -55045,8 +55341,8 @@ "markdown-mode", "spinner" ], - "commit": "4835feb8189fab4b00ba54ba73837c931022931d", - "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h" + "commit": "9330d7c3f1431b38f84a2296572531f9574b7d6d", + "sha256": "1sy68585wp07av0z8aam93j4ywcz0b95zg1da59w86k54j6i27cj" }, "stable": { "version": [ @@ -55139,8 +55435,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190826, - 1758 + 20190911, + 1324 ], "deps": [ "cl-lib", @@ -55148,8 +55444,8 @@ "lsp-mode", "python" ], - "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55", - "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp" + "commit": "42222bacf09c4ca18302ac39d50ea09d196e2816", + "sha256": "09a8kjc47v5qcrd4p0b911idbhh760xdir2bgkn3gm2w5l4krfyj" } }, { @@ -55220,8 +55516,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190823, - 541 + 20190915, + 856 ], "deps": [ "dash", @@ -55229,8 +55525,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c", - "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4" + "commit": "c8fa40c0f9c65877d1cabe1739e5f787adb24898", + "sha256": "040qzkd1zvyb0q3yxs2vd4f3qp37c8anr3zcmx96bjvj1v7pmpmn" }, "stable": { "version": [ @@ -55663,8 +55959,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190825, - 1416 + 20190906, + 2217 ], "deps": [ "async", @@ -55673,8 +55969,8 @@ "transient", "with-editor" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "5c424142704d481faafce7b834af67c1aca98e68", + "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c" }, "stable": { "version": [ @@ -55962,15 +56258,28 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20190504, - 1909 + 20190831, + 118 + ], + "deps": [ + "dash", + "magit" + ], + "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", + "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" + }, + "stable": { + "version": [ + 0, + 4, + 0 ], "deps": [ "dash", "magit" ], - "commit": "5ff5648158413aec01ba178f349c33862e6e140a", - "sha256": "1g1hawsmx2j69n25n2ip1lb8x3lshcyrn7f5w83dw56i5ywmyr0v" + "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", + "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" } }, { @@ -55988,8 +56297,8 @@ "libgit", "magit" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "5c424142704d481faafce7b834af67c1aca98e68", + "sha256": "0849yg97gkg3qp0xa67kxfq888i5nmmz0982zcvc3n4k6xswy52c" } }, { @@ -56175,14 +56484,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190808, - 1639 + 20190918, + 6 ], "deps": [ "magit" ], - "commit": "49faa9b94c338c0d5aa064f41b3acd50e5943421", - "sha256": "0wznf26l8hvdp8p6nbvwbwg2v33yrms72nsw0gvyvnn5mqiw4v7b" + "commit": "2b08d93c5ead14f34f9cc3c3140ecf25b1531151", + "sha256": "1h5lnns6adpyah2i1k8fznbq4qf43sf64a4vp8s5h67q2ajlf52j" }, "stable": { "version": [ @@ -56205,8 +56514,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20190805, - 552 + 20190907, + 1321 ], "deps": [ "async", @@ -56217,13 +56526,14 @@ "pcre2el", "s" ], - "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", - "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" + "commit": "a80dace2bf8bf3e697e3e8421189996adcecc900", + "sha256": "0qwzag9js6qy98m7c8gmaskg4qc82sf0aihcs5vcxdf8rgia2j9q" }, "stable": { "version": [ 1, - 4 + 4, + 1 ], "deps": [ "async", @@ -56234,8 +56544,8 @@ "pcre2el", "s" ], - "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", - "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" + "commit": "8557cf36260743674e7c3ecdb3038dca5106416b", + "sha256": "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6" } }, { @@ -57375,8 +57685,8 @@ "deps": [ "cl-lib" ], - "commit": "23078f2e59808890268401f294d860ba51bc71d9", - "sha256": "07b9w9vd22ma4s3qhplmg84sylihz920byyi9qa7dwj7b59d4avf" + "commit": "cec2140618692d5d8380151f570c2fac95deb6fb", + "sha256": "07bagma1kjirziyzgwmivf0j8fmdzia3d1a0npvyq0hkqnkwcn2a" }, "stable": { "version": [ @@ -57679,11 +57989,11 @@ "repo": "skeeto/emacs-memoize", "unstable": { "version": [ - 20180614, - 1930 + 20190915, + 37 ], - "commit": "9a561268ffb550b257a08710489a95cd087998b6", - "sha256": "1hsw7pjdy3mksg343v400068b6x7s45gzg0l74h5i4nq8bacv8km" + "commit": "8c1e5569550e783dd7814735e22c935416c4462d", + "sha256": "1pa9f8ydkabbxx5szgmvl4mn85pk2bw878z81vlfwbcz4nv8fr1h" }, "stable": { "version": [ @@ -57757,11 +58067,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20190718, - 1023 + 20190920, + 1510 ], - "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f", - "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc" + "commit": "91fc77b5d8e2612176684c12f2a3949b44bb27bf", + "sha256": "1wk49sjixx3q5iral9pn1nl4a1qv1hlpgadx49yp1d1qd2x8yy9k" }, "stable": { "version": [ @@ -58006,8 +58316,8 @@ 20190324, 1908 ], - "commit": "b79e48dd775de3e1a08e445953243f1491e244cf", - "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj" + "commit": "9dae5ef83bf3739fba5366a252450c0fcb460b70", + "sha256": "0fy962z5jqgrpyjqp8hd1xrvghbnl692h4zyksl9d93fhlisa3bf" }, "stable": { "version": [ @@ -58210,14 +58520,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20190824, - 1308 + 20190913, + 221 ], "deps": [ "dash" ], - "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089", - "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01" + "commit": "65b5371cd0c35983e6badd6b51493d4fddb8d7b6", + "sha256": "0rcxzvr7qgkfpx6kpcxrky3dm9dh791rk4ks7prn0rsgcmsi34f4" } }, { @@ -58353,14 +58663,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20181030, - 2101 + 20190918, + 2048 ], "deps": [ "dash" ], - "commit": "62f1d60a0852b4f83f64e6fc4c199eea967a34f7", - "sha256": "0q8py0v06sq9yy7f3w6m45q3nflnd3vppf3i53s0xib3izxl2vca" + "commit": "ca6a3e77ddbd19cdf363ea71ba357096395a5de5", + "sha256": "16rplpbfy3dnvqqgavk9jb1f1ihr5875zlixd4zxb1pqxs3jkgw3" }, "stable": { "version": [ @@ -59087,11 +59397,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20190109, - 1347 + 20190912, + 1624 ], - "commit": "2f472fdc09c1b36c291ddb5ed9aecc331fd7e082", - "sha256": "1g9v7z2bk2vcknpff31y9pf6cw8xrb5hxsh8cjci7i5w2abp7qbj" + "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c", + "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc" }, "stable": { "version": [ @@ -59111,11 +59421,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20190606, - 1046 + 20190911, + 2023 ], - "commit": "3560d8aafd8c856a218ff8fab5a30e1aa0db25b6", - "sha256": "08qh8x0gd7byvfp03jpkd95h70djh8vrwpm451932zwf66j7fnay" + "commit": "29ba63795911bdd535d569f0cc4e9d18cc3ac8e4", + "sha256": "0sp6cgpqrab1cgqy4vhgdfavmfz73h57aw0fxvywf348kxbqf28s" }, "stable": { "version": [ @@ -59135,11 +59445,11 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20190606, - 1111 + 20190911, + 2031 ], - "commit": "47fc825547664c3e3eb8f47f1a9cf74b23efc2c6", - "sha256": "17zz3nc3r2cm4w99frzqxnh768vnmzs71p9zz9bj03wc222n1kv6" + "commit": "2f044f7b1f68d450fd4c3c67209c353401621277", + "sha256": "10x1a9r537qd80rzhhp99mxx08fp8gpd8knrbb0565iqi3czk1rz" }, "stable": { "version": [ @@ -59159,11 +59469,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20190203, - 1747 + 20190831, + 1058 ], - "commit": "58af7973742bf381f5980413dfb21bf5f21b44f8", - "sha256": "11kahx0gzchmn3yh5n0cms58cmsbrhd2kj380qcnlqv390cknqvy" + "commit": "ac17d739075a571a086756fcaed482814888bf5c", + "sha256": "1yisg83khzfmdyqp450kfqgsy76wglb003j1bsann0z0xkw5pla3" }, "stable": { "version": [ @@ -59585,15 +59895,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20190827, - 1854 + 20190911, + 632 ], "deps": [ "libmpdel", "navigel" ], - "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f", - "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i" + "commit": "e09904bf31ed465ea93ef2c165e8a6f705229f57", + "sha256": "159nb9ws800d5lx5plh8y0mmjl1y6spwhaxm9f5kxs6psa89mckj" }, "stable": { "version": [ @@ -60199,16 +60509,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20170923, - 1233 + 20190905, + 2214 ], "deps": [ "dash", "ht", "s" ], - "commit": "5e39654b933a18131146a0f3b3e3dc55c5058124", - "sha256": "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82" + "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb", + "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8" }, "stable": { "version": [ @@ -61492,11 +61802,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190815, - 1740 + 20190909, + 1313 ], - "commit": "d2e627024ab7ce608b5203d4084c6a1588621545", - "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2" + "commit": "188af947416961b3ed86a7ac026952c8e530245d", + "sha256": "1bswdaxvx0f36zh9f8q343a8mr27g53jw5dxqpwk6x9ad7jiia83" } }, { @@ -61510,8 +61820,8 @@ 20181024, 1439 ], - "commit": "61f90e918b608413daf07ffcb5c5c0930416951a", - "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww" + "commit": "2321fd711c4bbe7bdc23060f3549f2aea9a95580", + "sha256": "1ak7hrm7wa8cdning4l8xh06p7kfdq1dz9r6svhbfqa9c7vb9zqy" }, "stable": { "version": [ @@ -61594,11 +61904,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20190703, - 526 + 20190904, + 1440 ], - "commit": "ddf091708b9069f1fe0979a7be4e719445eed918", - "sha256": "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad" + "commit": "5b5961780f3b1c1b62453d2087f775298980f10d", + "sha256": "0lyf9vp6sivy321z8l8a2yf99kj5g15p6ly3f8gkyaf6dcq3jgnc" }, "stable": { "version": [ @@ -62114,8 +62424,8 @@ 20190525, 1602 ], - "commit": "e13862f127394fd4addc5d2cf604b3af399c8377", - "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw" + "commit": "23bcd003637f091c88f7d0a601d5fee82bc8e936", + "sha256": "0n0pw2h3zc5an8xr5zv38cicwd9nk8klnrsihdkw0hvd7llmb3qf" }, "stable": { "version": [ @@ -62500,8 +62810,8 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20190601, - 813 + 20190912, + 626 ], "deps": [ "dash", @@ -62509,13 +62819,13 @@ "f", "s" ], - "commit": "4aeb672d543ce2372dcca289719092aa4c38a6cd", - "sha256": "0phillz5dxpvhsi9rlah4988ksx2rcgagfw5iqf5lmfn7kp4604p" + "commit": "e93e5216e311c665c593ac68c5456d624120ea42", + "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -62524,8 +62834,8 @@ "f", "s" ], - "commit": "d18b13e8275a57ee6c55dc71b671f02a8e6522ad", - "sha256": "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf" + "commit": "e93e5216e311c665c593ac68c5456d624120ea42", + "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" } }, { @@ -62663,16 +62973,16 @@ "repo": "astahlman/ob-async", "unstable": { "version": [ - 20190220, - 710 + 20190916, + 1537 ], "deps": [ "async", "dash", "org" ], - "commit": "73e57a9297849bb50336799ae7858777b6b386ee", - "sha256": "1g2agc6qwklg5cxfgm28fc5swlw54sn66lqk7q0hjn1gdq9rdqdm" + "commit": "80a30b96a007d419ece12c976a81804ede340311", + "sha256": "0jhgzmqds73yc49hc4yarp1a25pci9qmsvnpcxd7kv5saha40hnn" }, "stable": { "version": [ @@ -62756,11 +63066,11 @@ "repo": "nickanderson/ob-cfengine3", "unstable": { "version": [ - 20190520, - 1929 + 20190908, + 1801 ], - "commit": "4d4cd53ceaf8a756f48c02cb2e10476f3cda37c4", - "sha256": "0gmgx4ynbk6fvahaglj9m1gpz8d3b038zag4m7g7pmz0xv5s4p1w" + "commit": "d16fd0f1585d5f64dfae76498d43c764d81fc3f8", + "sha256": "1xv07hc2fcp9kvzmy5vdjwb6iq5mkj5vpxsnik0m68vcb2jnllbi" } }, { @@ -63402,14 +63712,14 @@ "repo": "lurdan/ob-typescript", "unstable": { "version": [ - 20150804, - 1230 + 20190910, + 946 ], "deps": [ "org" ], - "commit": "9dcbd226cbfb75e790dd9de91d9401dde85a889a", - "sha256": "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai" + "commit": "0b2766b9d136cd6d81f4c15f1ad4b28542f484b9", + "sha256": "0crz6k41bva53x3qhvvzzdlml4v18f43fja8nkrlgwpn103d0x9h" } }, { @@ -63641,17 +63951,17 @@ 20190726, 1452 ], - "commit": "bdd84a71da8eac87447e35b55782ec07f0d2aead", - "sha256": "0cvfzz1i3lh9q5fl26sp98cqpv3mqjxlzlflv8hc3cdr8ascjm4g" + "commit": "daeb11532f846caa0e94b999dd2a413003a885b6", + "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m" }, "stable": { "version": [ 1, - 7, + 8, 0 ], - "commit": "6e6ff005fc1692489fa80767a23bc381ebc987e1", - "sha256": "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc" + "commit": "daeb11532f846caa0e94b999dd2a413003a885b6", + "sha256": "01vw2r3xfjmsm6v5l7w7f2rlwl8qhs8fk5rp5j284db73gbqx61m" } }, { @@ -63721,14 +64031,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20190826, - 718 + 20190916, + 657 ], "deps": [ "org-re-reveal" ], - "commit": "f62fe1497be473d776d22094a02cfff381c61cfc", - "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m" + "commit": "b30cf2b16b4987152df8355beab8b8fdcbc22c1f", + "sha256": "1m6b5cg5rkimp03w1zgxfh2yycifyj89a5rripr2bic1wp6bifzw" } }, { @@ -63784,6 +64094,30 @@ } }, { + "ename": "olivetti", + "commit": "10292536096e698f37e6ad81a4d5b6204beeb7cb", + "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd", + "fetcher": "github", + "repo": "rnkn/olivetti", + "unstable": { + "version": [ + 20190907, + 2028 + ], + "commit": "4bd3fb51961f8aacc3021bbaa9b39d90240f257d", + "sha256": "1wm1hhk08q6yvmy5aphd2msl9zj2basxc88ny2krjspbz3rcfnds" + }, + "stable": { + "version": [ + 1, + 8, + 0 + ], + "commit": "57dbb94384d0ad0addd9b30c2dcade0362aa1476", + "sha256": "0ba30swqxxbpa8866chymywnahby1hk670zzkz44q49328i2wksj" + } + }, + { "ename": "om-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb", @@ -63977,8 +64311,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20190809, - 341 + 20190915, + 1000 ], "deps": [ "auto-complete", @@ -63990,8 +64324,8 @@ "popup", "s" ], - "commit": "b5afa053c8d3771d5567538bae89a03cc66e826c", - "sha256": "0vhjfig0yx2ihqbq9ah6w7vs84lbnn5zlkjlda63kfs5cwwi43vp" + "commit": "c1dab2beae4b1e67f20f3e90cddeba81bd236fe5", + "sha256": "1pm8pv3iccpmyg0bs19d28g56gwfbkkp6d4i1qyxkf371d9w7r3w" }, "stable": { "version": [ @@ -64454,20 +64788,20 @@ "repo": "rksm/clj-org-analyzer", "unstable": { "version": [ - 20190827, - 2211 + 20190914, + 2215 ], - "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28", - "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f" + "commit": "576e1fda552af0da4e64070e2b26303a913f17a9", + "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4" }, "stable": { "version": [ + 1, 0, - 3, - 5 + 2 ], - "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97", - "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc" + "commit": "576e1fda552af0da4e64070e2b26303a913f17a9", + "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4" } }, { @@ -64622,14 +64956,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190830, - 757 + 20190916, + 619 ], "deps": [ "org" ], - "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01", - "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx" + "commit": "3098a782d3add11795036f7894adcf73e3a9472b", + "sha256": "1crlh3a9glz29zwnsnv1i6ha15l39zmmbvbk85pk91da7ikjb0qr" } }, { @@ -64825,11 +65159,11 @@ "repo": "mallt/org-clock-today-mode", "unstable": { "version": [ - 20161014, - 920 + 20190915, + 701 ], - "commit": "02b8fd541a01040405a9a1400c46dcb68b7c2a3a", - "sha256": "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9" + "commit": "18af3fede1aa0ccab83ce9195f94f9097f51c548", + "sha256": "0knjks1rzl7p38r36g7a186mlxsc5dr88a7q0mxjsgg86vjx1xwf" } }, { @@ -64976,15 +65310,15 @@ "repo": "vapniks/org-dotemacs", "unstable": { "version": [ - 20190116, - 2155 + 20190903, + 2024 ], "deps": [ "cl-lib", "org" ], - "commit": "5f504f36af6bcb9dbe9869c7ed54851d3db742e7", - "sha256": "0pxphad9qxssqxr50g0mf20b7247xjp9a6fmb494bj8yv6wnn9m9" + "commit": "ee59739c2d59151fe7d7d3034e87c7691120a5be", + "sha256": "17xrjhfjahryawrmkd2p0yi7pfxfvgdfhh4n18jdmfkrr6gllavg" } }, { @@ -65274,17 +65608,16 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190826, - 2152 + 20190902, + 252 ], "deps": [ "alert", - "cl-lib", - "org", + "request", "request-deferred" ], - "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d", - "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93" + "commit": "19ebbc647d8f4098cdda986aff2fea66e6da13ef", + "sha256": "1jvdwlqjgqic2v5nwkiz523nry4jphxg3wp9pin4vxw55vzm5ygb" }, "stable": { "version": [ @@ -65384,11 +65717,11 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20190829, - 1443 + 20190920, + 356 ], - "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2", - "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19" + "commit": "aba9b1ea49e83c541c544e4030fcc2e0a55c908b", + "sha256": "1rpbas9svwni6nz5jywvxxvan0lgrqi100aby1aivi3prsmh6jhy" }, "stable": { "version": [ @@ -65463,11 +65796,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20190826, - 1919 + 20190914, + 1643 ], - "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00", - "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z" + "commit": "5481b6c7410cbc68f0966b5b5840c0048edc3fef", + "sha256": "1afjz5s7z0lfb67wsdckgsj2h9rr31gm8424v2w243xmz2lzgrjx" }, "stable": { "version": [ @@ -65796,14 +66129,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20190822, - 2115 + 20190916, + 2334 ], "deps": [ "htmlize" ], - "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781", - "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb" + "commit": "7616a9760bd1e3fb0e6a22f6e1cbc2bf71a733df", + "sha256": "0mccaw4wvh4624iyxfbv1jr01z7fkjg5mcl56scq164daznm200g" } }, { @@ -65864,15 +66197,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190829, - 2358 + 20190913, + 1509 ], "deps": [ "cl-lib", "org" ], - "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055", - "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl" + "commit": "a926c1075964f4a972467c01b807d6a01fd5d0b1", + "sha256": "0fb5r5aslqkd48h2l502sq3hixwcy64m00p17znnagf699djfhfl" }, "stable": { "version": [ @@ -66094,6 +66427,21 @@ } }, { + "ename": "org-picklink", + "commit": "c6c44a3e5a1c5e4acdf76c4d6f2f4b695aa6938e", + "sha256": "0gr4psgps9775hh0pvcyq3x2irrzkzpm5ghcnc9ddp5hn41yv57m", + "fetcher": "github", + "repo": "tumashu/org-picklink", + "unstable": { + "version": [ + 20190902, + 654 + ], + "commit": "e8c95e188b60ff84d794cbedbcce6732ccb82e4f", + "sha256": "05b488h1b5yvh0892358ndina2lywh67lhvqp180rp5ivz7zqm10" + } + }, + { "ename": "org-pivotal", "commit": "c1257d38bbd3a9944135b000e962f30ab28f5464", "sha256": "1gv4968akh2wx92d7q1i1mpl9ndygkq8ssdwg6cf19wp8mk18088", @@ -66327,8 +66675,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190830, - 1527 + 20190918, + 633 ], "deps": [ "dash", @@ -66336,21 +66684,23 @@ "s", "ts" ], - "commit": "58b298153c482e6517995bb94f28e03aaf9924bd", - "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4" + "commit": "8f2a02264f1dcd45e0d060655bffc45a7bde8235", + "sha256": "12xqg8w52q2bnbrsl49r0ygnsx8014skhfqjsfz3s9v0myfhx0m1" }, "stable": { "version": [ 0, + 2, 1 ], "deps": [ "dash", "org", - "s" + "s", + "ts" ], - "commit": "eb281fe34569901d84b502c1734d01cdb09246d8", - "sha256": "1nvzirn1lmgmgl7irbsc1n391a2cw8gmvwm3pa228l2c1gcx8kd8" + "commit": "55694f17fce4dc566f533b0b5f8cd60c4dad9670", + "sha256": "1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48" } }, { @@ -66429,28 +66779,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190826, - 749 + 20190914, + 1607 ], "deps": [ "htmlize", "org" ], - "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8", - "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq" + "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474", + "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2" }, "stable": { "version": [ 2, - 1, - 0 + 5, + 1 ], "deps": [ "htmlize", "org" ], - "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824", - "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p" + "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474", + "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2" } }, { @@ -66480,8 +66830,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190817, - 624 + 20190909, + 1618 ], "deps": [ "dash", @@ -66490,8 +66840,8 @@ "org", "s" ], - "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082", - "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0" + "commit": "6430700dbe2ba34d852b36d56b3a879d71dabc9a", + "sha256": "0rl7f2dnwv90l7dnhgzaqnpmff0li366dmkiprjydxchkh1n7mic" }, "stable": { "version": [ @@ -66548,8 +66898,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20190802, - 1327 + 20190916, + 1534 ], "deps": [ "dash", @@ -66563,8 +66913,8 @@ "pdf-tools", "s" ], - "commit": "9ab74270c1543e4743ca0436de567d8205403b43", - "sha256": "0ma9zaxzrd1dzmk8633bkw6wrp03wrm9bjhrgsp9qp7vhm597fdq" + "commit": "0831d2bfe5820d72121fe66e9e298cac04c23b71", + "sha256": "07wy73ybqd5zbi6qjvkqrag5jab1aswzrjvvajcips8ka849vsp5" }, "stable": { "version": [ @@ -66619,14 +66969,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20190806, - 1412 + 20190914, + 102 ], "deps": [ "dash" ], - "commit": "0c70a06474921638eba3c287472879ce903ee8b7", - "sha256": "0fdndpy7j8idbrqpn85hnwj8caf737hcind00blbvc5rka85vaq4" + "commit": "a3bc7846531b55337ec069d0696b8d8a04fad3de", + "sha256": "0xhsv46xx9bzakzpb9y133s9drj5vyg8wrm15llqhgnaygakpfj6" } }, { @@ -66769,15 +67119,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190824, - 814 + 20190907, + 1859 ], "deps": [ "dash", "dash-functional" ], - "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", - "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" + "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20", + "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48" } }, { @@ -66795,8 +67145,8 @@ "org-starter", "swiper" ], - "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", - "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" + "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20", + "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48" } }, { @@ -66807,11 +67157,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20190619, - 635 + 20190916, + 1307 ], - "commit": "a269b23e1b258b1cb9d80dfdc1d1d4c126f8241a", - "sha256": "019m07j6nfq18kv4gxsk99wb2wpisw0rywbx4xx63s8p3aaizv62" + "commit": "f01d3793c4f1ba7099e12e7ed6d1b9c14bd48152", + "sha256": "0bg3yhy7a80gak7c0ilki8mv46hdzqddps232ab9zr7z6k01kpzj" }, "stable": { "version": [ @@ -66861,8 +67211,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190815, - 2140 + 20190909, + 2144 ], "deps": [ "dash", @@ -66871,8 +67221,8 @@ "s", "ts" ], - "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a", - "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697" + "commit": "f0ee7ed9766d352d16a787707d35695b48cbf153", + "sha256": "1b1qi96x83acv2frl94i4frx46i82vipaa8mfwpzyj2gyq2bq5zf" }, "stable": { "version": [ @@ -66973,14 +67323,14 @@ "repo": "cute-jumper/org-table-sticky-header", "unstable": { "version": [ - 20190703, - 405 + 20190906, + 211 ], "deps": [ "org" ], - "commit": "2b0b36a075043ff426cca077bf4099b6ee4bf187", - "sha256": "08xd5qc19cc2000qgs5a5ywz5ykiwb0zhc0mghx599phvpprdfwz" + "commit": "7789e2064acef418d4959eb15ee2648227968c9d", + "sha256": "190465gxhx9hirxwnl9gm1awqv87l6rxdm34yjmkhpm1zaaykc4l" }, "stable": { "version": [ @@ -66996,6 +67346,21 @@ } }, { + "ename": "org-tanglesync", + "commit": "9282e48b725e835fe8dfb226dacbea40257584c1", + "sha256": "1vyvy5l7bb8v7c190rzi7r1nz7vlq4yj2bskhcw35h6df3zy3j2y", + "fetcher": "github", + "repo": "mtekman/org-tanglesync.el", + "unstable": { + "version": [ + 20190916, + 2055 + ], + "commit": "1e26c3fa1fce8c16edcb7e53a90bc3c37603453e", + "sha256": "1mq63vq7f6v6x2j99dd4vpi0417rk5k9m8ggqzc1n22lnymzck2z" + } + }, + { "ename": "org-tfl", "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", "sha256": "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf", @@ -67282,8 +67647,8 @@ 20190409, 1815 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -67701,15 +68066,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20190630, - 1437 + 20190919, + 1859 ], "deps": [ "dash", "org" ], - "commit": "30e27843fbe916c26b4fe15948415b9c44e9d153", - "sha256": "0dqm4i2ykzaxairbralz6b1h3gga7falvg5nvw3180mkkrkcjbx2" + "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", + "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" }, "stable": { "version": [ @@ -68526,14 +68891,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190830, - 1623 + 20190905, + 303 ], "deps": [ "org" ], - "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb", - "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5" + "commit": "b5672ea8925eaff93c4e17982b35acec302ba5e7", + "sha256": "1z9c85z55an38wrg6vmal8vp8k8qp1wkfxc9ijjlqsh0i2809x6b" }, "stable": { "version": [ @@ -68837,14 +69202,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20190810, - 1655 + 20190918, + 1627 ], "deps": [ "org" ], - "commit": "4abd898da3b24530a80336327ec29d3ae6ad4ec9", - "sha256": "0ik5r99hv407yalvdwba62rppaf9g0r9qzyp4iz0i3n1mhcnv0h1" + "commit": "d692f2fae4b01bb10b47828692e1654fb339bbee", + "sha256": "1sia5ijs0alr64078bdiax3mzr8103kzs8ia6k4qbv3a1w5bzgyf" } }, { @@ -69265,14 +69630,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20190807, - 1837 + 20190908, + 2158 ], "deps": [ "cl-lib" ], - "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", - "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" + "commit": "6bee682fac762fd245f9156718393a4eb05c45ed", + "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh" }, "stable": { "version": [ @@ -69300,8 +69665,8 @@ "deps": [ "package-lint" ], - "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", - "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" + "commit": "6bee682fac762fd245f9156718393a4eb05c45ed", + "sha256": "0vc0d610q7wpyfvf395958njkwpl33bsfi288pi2qcvl6smr1hlh" }, "stable": { "version": [ @@ -69428,11 +69793,11 @@ "repo": "kadena-io/pact-mode", "unstable": { "version": [ - 20190710, - 1817 + 20190903, + 1542 ], - "commit": "5df7032cf9b61ae5aff36ac7d2a23b2ab0e00904", - "sha256": "0hdg5b3mnld8pcfiawn51dc65dfws6gr7j4fvjc2gnhypy36l8xl" + "commit": "f836c376e142b372a92900b630511fde9937a51a", + "sha256": "00xp8j9hgqscz865pp4s5khngpsidad6arwybcxh1cfsncc6w8f2" }, "stable": { "version": [ @@ -69594,11 +69959,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20190801, - 1622 + 20190907, + 314 ], - "commit": "30dac32f9b18fb225ade8e56f7d9242d6c8efb35", - "sha256": "1d6wykf2k5b0494l2l8p9p0hmq52jvcq534dz4piwgnngrjcbq8n" + "commit": "5a3da498a8ab8a60cef3a3a5e8f3e14dea9992dd", + "sha256": "04fa2895vr0z6y1w1mkpxhzx2q323vl7r3hayxr0vldd8mz8m0lw" } }, { @@ -69656,15 +70021,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20190711, - 2122 + 20190916, + 1104 ], "deps": [ "dash", "hydra" ], - "commit": "7b9a19d8777a21431a819281a14201bfdf1dfdc1", - "sha256": "04bqc7mhgkfks3nsvimd3rrriv4nqbksmv5ahlbbd03aqa2b0vrv" + "commit": "554a942654f850077364d2358177f232cfa0f06d", + "sha256": "1va4yykj8sfvgx7f6v4vyxl316y58xgc6naglpjvq51jml1x1sss" }, "stable": { "version": [ @@ -69691,8 +70056,8 @@ 20190823, 401 ], - "commit": "2e2dc6427b4427b045df37ba793884c6225c262e", - "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h" + "commit": "f92898949ba3bf991fd229416f3bbb54e9c6c223", + "sha256": "0c8ad30313598mggjiq4szz1alc6kcswh7i8447kdci241rlyqrf" }, "stable": { "version": [ @@ -69714,8 +70079,8 @@ 20190124, 1828 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -70101,6 +70466,19 @@ ], "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569", "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "a", + "parseclj" + ], + "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569", + "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc" } }, { @@ -70126,29 +70504,29 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20190715, - 1509 + 20190830, + 2017 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "ba6a3f695acb380e1457a29a0d13b22641f72c4f", - "sha256": "14g50fywwgf9bpqnl6bvq2k1czl9m2da43xcdrng2gpyrz3ns1w3" + "commit": "35e3f86e96878520e690513cdbc1b2753b173e72", + "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p" }, "stable": { "version": [ - 1, - 8 + 2, + 0 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "cd79375005a1c1d8b45d38fefa91eef0bd23182c", - "sha256": "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx" + "commit": "35e3f86e96878520e690513cdbc1b2753b173e72", + "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p" } }, { @@ -70248,8 +70626,8 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190829, - 1054 + 20190916, + 2027 ], "deps": [ "auth-source-pass", @@ -70257,8 +70635,8 @@ "s", "with-editor" ], - "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75", - "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8" + "commit": "e74a1c738f7cda65c7a308e30e8d122f853d6f70", + "sha256": "07g2w57q9lvgf5wznyg2ybkrw6w1f5w4jqi8zbw9lzkvj4iz3rg7" }, "stable": { "version": [ @@ -70773,15 +71151,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20190701, - 202 + 20190918, + 1715 ], "deps": [ "let-alist", "tablist" ], - "commit": "db7de3901ae0e55f6ab8cf9baec257f706c3d16e", - "sha256": "1vvhgxxg5lpmh0kqjgy8x1scdaah3wb76h2zj7x99ayym2bxyigv" + "commit": "c851df842e05f353e4d249f2653f98418b3345d6", + "sha256": "1ij2w7lhwx2f88m35xp56risa29qrhh2p6xnvc3rnbb9iszajs3i" }, "stable": { "version": [ @@ -70804,14 +71182,14 @@ "repo": "007kevin/pdf-view-restore", "unstable": { "version": [ - 20190423, - 1625 + 20190904, + 1708 ], "deps": [ "pdf-tools" ], - "commit": "12d9734d2133dead548497193016c86ab28e9477", - "sha256": "1z5483jclfn1xrcdrvrw2c94fpnb1skv6c2ppi3w5nj4myny6nsv" + "commit": "5a1947c01a3edecc9e0fe7629041a2f53e0610c9", + "sha256": "1b9zzvfsprf7x0v7l4dabdh5qdfhl7mm30vvqah8l10jvlf2wlc7" } }, { @@ -70930,14 +71308,14 @@ "repo": "sebasmonia/pepita", "unstable": { "version": [ - 20190731, - 1610 + 20190907, + 409 ], "deps": [ "csv" ], - "commit": "1d67dad08cb994dd2fa637ea591db14cbb00d644", - "sha256": "09lqjssg72bq437cvg15dxmy7j446raaknvkp7pl5357vgmqcdy0" + "commit": "489ddc2675906f9dd27bd4ec69ef140e52194952", + "sha256": "1k77c7zz73j2vais62qbymk246fyc6nw4jd1abdx2c9jjp3sn94k" } }, { @@ -71198,14 +71576,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20181120, - 114 + 20190915, + 2104 ], "deps": [ "cl-lib" ], - "commit": "2c8cf56d170c3eb1fcc1a8fe41026b780e0ffead", - "sha256": "0xlib2f8fjmwk8r0p6r8y5ni687xmixqp9s40rgxc15ikin54hhf" + "commit": "519838e2647268567c086b77158a55b01feb7f6c", + "sha256": "07bak10gy0ziy7zm9ha8sqfl564nxqhcaaicc35l8zk7qk11gj65" }, "stable": { "version": [ @@ -71401,14 +71779,14 @@ "repo": "zk-phi/phi-grep", "unstable": { "version": [ - 20170606, - 807 + 20190920, + 908 ], "deps": [ "cl-lib" ], - "commit": "ab9bd8d25e751a9cbfa108b49839293230b6e8b5", - "sha256": "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0" + "commit": "06b740e3fb20074be9bae87530f5616a122c3aca", + "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny" } }, { @@ -71667,14 +72045,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190827, - 1721 + 20190919, + 1405 ], - "deps": [ - "cl-lib" - ], - "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f", - "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c" + "commit": "d144da948fed71c4fad3494de9e78e1a6fc96c6f", + "sha256": "0m1amqbwz63j6kimk2kj6p8ba30qnvby13dc6iszxf0p78hzdhrx" }, "stable": { "version": [ @@ -71765,8 +72140,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190824, - 500 + 20190913, + 1340 ], "deps": [ "async", @@ -71775,8 +72150,8 @@ "f", "php-runtime" ], - "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", - "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" + "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", + "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" }, "stable": { "version": [ @@ -71840,10 +72215,10 @@ "version": [ 0, 3, - 1 + 2 ], - "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183", - "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j" + "commit": "de74ebfcbce53a08daf95d324d7447dede094222", + "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" } }, { @@ -71958,8 +72333,8 @@ 20190824, 806 ], - "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", - "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", + "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" } }, { @@ -72259,16 +72634,16 @@ "repo": "pwalsh/pipenv.el", "unstable": { "version": [ - 20190522, - 803 + 20190919, + 2147 ], "deps": [ "f", "pyvenv", "s" ], - "commit": "03edaaa44a5a4212d2e5a14e3ae6303189d76703", - "sha256": "04y6p8gd20xhn7qkz2gp94yxizwl67yhi7qs0x6c8nrxpqd1y5y9" + "commit": "b730bb509e8b60af9f5ab1f1e6c3458d1d95d789", + "sha256": "0f2lihzzw9v91adx9v89crbsph4zjj0qrlb3a8fikbhd6jy8xpb8" } }, { @@ -72411,8 +72786,8 @@ 20171124, 410 ], - "commit": "a3d5389a44326314da21f147bad2ede60e2cf986", - "sha256": "0qik5478z49fpn9b37fxkybglvsgzbapl1dkam5prg0sxns98xha" + "commit": "48b37b9b19d8f1e0accbf930f30b5346cf7959fe", + "sha256": "0pi4sjp0aq279m449lw4rbppdivzkazd07bh9jqrmyrw9wib3hbl" }, "stable": { "version": [ @@ -72460,26 +72835,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190822, - 1403 + 20190905, + 838 ], "deps": [ "dash" ], - "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248", - "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg" + "commit": "1590a75da6c3e25b726bc5e3e12656faab968917", + "sha256": "0l20vkq4d673a12lf15m7zn2yzkzf0qkqmq35hi6kpy4bd3zar2v" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "dash" ], - "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88", - "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0" + "commit": "5889166b6cfe94a37532ea27fc8de13be2ebfd02", + "sha256": "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc" } }, { @@ -72658,11 +73033,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190824, - 541 + 20190914, + 513 ], - "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", - "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", + "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" } }, { @@ -72985,15 +73360,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20190706, - 1141 + 20190905, + 959 ], "deps": [ "pyvenv", "transient" ], - "commit": "0173c61dee6587d5898722df1e06d9c00bee4fd1", - "sha256": "1n3xzw204hy3l1kisjpgg01n12x1z01mxfqi3hyfw3w3hlxciw7b" + "commit": "9fcefd042355a0280b11ac61e45b52b9819e9c2a", + "sha256": "07vhgvpz35infidsw6bh0rxmfhyvmqn93vl9456lfhwyhwka366p" }, "stable": { "version": [ @@ -73188,15 +73563,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20190715, - 707 + 20190916, + 702 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "6fc4b26392f101494ceb176a8446b159c8a6ac29", - "sha256": "0jvn7l59z8ncbs6bwk3ka13gcmxq615w9qp9fam1fvmc3dykakn8" + "commit": "a867e5e5689f1e1a5bab5db57c7d39bac2448bcb", + "sha256": "1mrmrwmrv6xsafhn7ys3y8nbdqgzhkrb2mm0gir63g03kd6bn793" }, "stable": { "version": [ @@ -73702,15 +74077,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20171205, - 851 + 20190917, + 1634 ], "deps": [ "cl-lib", "popup" ], - "commit": "f5788a31918e37bb5c04139048c667bcec9f1b62", - "sha256": "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk" + "commit": "953f599c1fd9d6843ec9380cc0fc3f8248390d24", + "sha256": "1h0mxx1304fp4ilv4cz5mb65a7df1b3hi6n4dz6k9kkzbvihsacc" } }, { @@ -74055,19 +74430,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190727, - 2126 + 20190921, + 3 ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -74236,6 +74611,24 @@ } }, { + "ename": "prism", + "commit": "c8ee14b9d67a9703c25b508b324ad7dabaa4352d", + "sha256": "1prvvpwa10i260hcj59xfj1vynjv7gykxinqas2xhw6lq6lwrbjk", + "fetcher": "github", + "repo": "alphapapa/prism.el", + "unstable": { + "version": [ + 20190908, + 1820 + ], + "deps": [ + "dash" + ], + "commit": "49c8b97b286c7403bf239645964416200ea82dd5", + "sha256": "0dcy032g4jc027mwq8dfadsc05bsi1k6yiab3rpdxwc17c9pg9x8" + } + }, + { "ename": "private", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", "sha256": "1mvma2xgjy9vkh468x80xlri6qfr7d494la1j6r1clkjsn5kg7hr", @@ -74291,14 +74684,14 @@ "repo": "travisjeffery/proced-narrow", "unstable": { "version": [ - 20190818, - 1923 + 20190911, + 1818 ], "deps": [ "seq" ], - "commit": "079a6834869638ae3586a68474149575d7623ef0", - "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx" + "commit": "0e2a4dfb072eb0369d0020b429e820ae620d325e", + "sha256": "0d1qq5606prls7mzy0iri41j2c14l4axz6kq629r4wjdqwshxkli" }, "stable": { "version": [ @@ -74610,14 +75003,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20190626, - 1315 + 20190904, + 1025 ], "deps": [ "pkg-info" ], - "commit": "71a01f409a319d57eb3832e93e8a412fbc9d7a65", - "sha256": "1qsm4kwydi56h7p0mdm7m8r6nhm4l7lp7snamcgjyfmja2w424fl" + "commit": "0707fc4fd6cb10959bede0d321a915a959c466aa", + "sha256": "14bz3jp0qvq36h70jrv7y18zfgrlh258v18r6sr8fm6pa05kchr8" }, "stable": { "version": [ @@ -74731,8 +75124,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20190706, - 1231 + 20190913, + 1003 ], "deps": [ "f", @@ -74741,8 +75134,8 @@ "projectile", "rake" ], - "commit": "b0c88a381cc15b0aaba2629949e10ae6373d209a", - "sha256": "0p33gmykri30csv9b214rmmcxm59c0lcwhbwala78a28y63mfcri" + "commit": "d31af287b2228f855e0bfbc5f985f999e5b5f811", + "sha256": "1r4ib96kkhy40m5jd63d9qml9k495zcjk12mwxcid8pk0f1s8l7d" }, "stable": { "version": [ @@ -75149,17 +75542,19 @@ 20170526, 1650 ], - "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb", - "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx" + "commit": "b9f405ae46036860a4e73e167bee3800dfe53a9e", + "sha256": "0q70rsi012ybyq7akanl2np4x0ajqcmjknwcwrk3issy24l9f9sq" }, "stable": { "version": [ 3, - 9, + 10, + 0, + -1, 1 ], - "commit": "655310ca192a6e3a050e0ca0b7084a2968072260", - "sha256": "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h" + "commit": "ae1bcaad6ffcd04ca5d40f21dc3fab4f965e49cb", + "sha256": "0slzayqgda24z24470lx0iv0rqvvj0jg7g8izbgx2l5g04al0ihz" } }, { @@ -75428,8 +75823,8 @@ 20190828, 1136 ], - "commit": "c47ea8fca65c0f964365488a392e51798d698cdd", - "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3" + "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241", + "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3" } }, { @@ -75892,8 +76287,8 @@ "deps": [ "pythonic" ], - "commit": "eabb1c66f9e0c0500fef4d089508aad246d81dc0", - "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3" + "commit": "123facbaca9aa53dbf990348ea2780cbbdd0f96a", + "sha256": "0gwf5za48b20lfs3cm0syd2jmnnzgyqx5b4f4vvfiipyy8dqgxjf" }, "stable": { "version": [ @@ -75971,8 +76366,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190826, - 51 + 20190906, + 708 ], "deps": [ "async", @@ -75980,8 +76375,8 @@ "pyim-basedict", "xr" ], - "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494", - "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r" + "commit": "8a14040b6b6f600c6e0df2455a19662c997a1768", + "sha256": "11ysppg9h2n2m9qi6ml5hi1lwqj7h21hdi4h50cw5b24k334dyyz" }, "stable": { "version": [ @@ -76126,8 +76521,8 @@ 20170402, 1255 ], - "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f", - "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq" + "commit": "de75ba13eedd6cb6e84a96e0b79765e890c46efe", + "sha256": "0z81z1j2qgpgbx4mjj57fkaxvxwbnzm2hrnaayi1nlkf72a6ccj9" } }, { @@ -76356,11 +76751,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20190819, - 1244 + 20190912, + 1653 ], - "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a", - "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx" + "commit": "2fc13db9eb7652b3f6619fbd1a96073850ee6175", + "sha256": "0mw3hvslvvj6h56nc42my94vjci36k3yr44511635vdmfsmdzafl" }, "stable": { "version": [ @@ -76487,8 +76882,8 @@ "f", "s" ], - "commit": "1ba07048cffa0f95d7d1c75eab2d2be175e67cb6", - "sha256": "12dhh11q16crhb6dffwx3s7ncgbqsvc2dvpkzgllr58iwd8hs2kk" + "commit": "97135d933db4567fd817c51b3c93c94b2864395e", + "sha256": "08x5q7cgrgaamjidbzr65d0x5f0q1wmdzz4rlvw38mv6y30pifnr" }, "stable": { "version": [ @@ -76514,11 +76909,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20181228, - 1722 + 20190916, + 1037 ], - "commit": "fa6a028349733b0ecb407c4cfb3a715b71931eec", - "sha256": "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh" + "commit": "392e28dad42dc6cc9507e496391a32482f9f1881", + "sha256": "0kmzqinlv99wpm5q0lzwlzmjsc03m4z24pwz3zixldh76f7c2fmb" }, "stable": { "version": [ @@ -76955,14 +77350,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20190803, - 1820 + 20190917, + 1350 ], "deps": [ "faceup" ], - "commit": "5300aa004f08535c3fac99f1af78462f129aca81", - "sha256": "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray" + "commit": "8e2c6c5c7fc2677f18067f5f6ce4b1836d288352", + "sha256": "1iwsjdw52plkvivj79rk83d15l6wfxpg7l78hkbhzg3brxj0lg1l" } }, { @@ -77302,6 +77697,30 @@ } }, { + "ename": "rbtagger", + "commit": "2365f30d641474e121d64729e5f57641bbb44d17", + "sha256": "03f34vb6rks67mgxn0yk2imfsn9fsshi2j3fv4zilb4dav778n4y", + "fetcher": "github", + "repo": "thiagoa/rbtagger", + "unstable": { + "version": [ + 20190916, + 1757 + ], + "commit": "d82c64d01002077f6bd5fa9d78c35ab3d6ef63e0", + "sha256": "0azd15bpn8z7538fq2s577ljwj2r5b6qf511hrzr9791m8vnzb3h" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "dcc8ca8b9c1e42e637b9225b7ad8a3d50dd01be6", + "sha256": "0rrpjq3dczwp2vj4dclylid27hwd0am0l8p9kqy67wldkkcc0qz2" + } + }, + { "ename": "rc-mode", "commit": "d8062b2e5b2744a6e614b389cca7e7f21b582f6f", "sha256": "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf", @@ -77580,16 +77999,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20190724, - 2001 + 20190912, + 744 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "11c57cd2ea898c2167ad6c7f80eb1807109d8260", - "sha256": "0x5d2g18sywh36gp1l2pbjfx4qp3gpvgrkx8gvjsgjdfgmpiygag" + "commit": "cc5d1236879a2dcdd91c9a842987f2f5a3accd11", + "sha256": "0a27lmaqbhg227insacadrcxhzi6pi64hj4yx3mkppnhiyaasy6v" }, "stable": { "version": [ @@ -77673,15 +78092,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20190604, - 702 + 20190912, + 1335 ], "deps": [ "load-relative", "realgud" ], - "commit": "f2f77d6ddfa42430ead400eaf81c605c3a04dead", - "sha256": "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm" + "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a", + "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq" }, "stable": { "version": [ @@ -77805,15 +78224,15 @@ "repo": "realgud/realgud-trepan-ni", "unstable": { "version": [ - 20190528, - 2211 + 20190912, + 1418 ], "deps": [ "load-relative", "realgud" ], - "commit": "4cd936edcc89324a819b21aa1afd331c02e6bd3e", - "sha256": "0h0d8566km6v7rgiqx54lwazwwl929npxicg8dx8qw12q13vkk31" + "commit": "6e9cac5e8097018aadf41c88de541168036cc227", + "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3" }, "stable": { "version": [ @@ -77831,6 +78250,30 @@ } }, { + "ename": "reaper", + "commit": "034737d27ad4305b526210e82fe320db4f72a84c", + "sha256": "0yr1nb550903g0i2x7arw155v0x5vi4hbdniddwaxa4v9712gphj", + "fetcher": "github", + "repo": "xendk/reaper", + "unstable": { + "version": [ + 20190920, + 2209 + ], + "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b", + "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b", + "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g" + } + }, + { "ename": "reason-mode", "commit": "f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492", "sha256": "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr", @@ -78350,11 +78793,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190830, - 1152 + 20190905, + 730 ], - "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e", - "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y" + "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d", + "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz" } }, { @@ -78421,8 +78864,8 @@ "repo": "proofit404/relative-buffers", "unstable": { "version": [ - 20160221, - 1923 + 20190914, + 1042 ], "deps": [ "cl-lib", @@ -78430,8 +78873,8 @@ "f", "s" ], - "commit": "2547475084244d266b507e563c9b4034705cfeca", - "sha256": "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq" + "commit": "496fd31530adc455992b2bac535900fd29b9ad51", + "sha256": "14nqs14ml33wlrm268dpijs0n2b12yrlysk1qd62fc7k5hvz9wxl" } }, { @@ -78733,11 +79176,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20190819, - 1735 + 20190920, + 1649 ], - "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", - "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" + "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9", + "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq" }, "stable": { "version": [ @@ -78764,8 +79207,8 @@ "deferred", "request" ], - "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", - "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" + "commit": "b074594a8eafe8fbd2f97687ac396900e2fe57b9", + "sha256": "1pahi7vvffcpldc5x39brpvjfipyqzagjzmmmdg6mxk5hjw2dvyq" }, "stable": { "version": [ @@ -79078,21 +79521,21 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20190828, - 1339 + 20190917, + 1351 ], "deps": [ "cl-lib", "s", "wgrep" ], - "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8", - "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz" + "commit": "316dd7e3e7d9fa1f55a5cc3233469970589a2dee", + "sha256": "0wc2qmzfc77ff25cml1fb1pdng57jnwj8gxkh67p0gh8irl62714" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ @@ -79100,8 +79543,8 @@ "s", "wgrep" ], - "commit": "77670a4bcdba138a0cef3fb12a20b1492dca902a", - "sha256": "0hpxkpyylzvzzvqc51ac0r89nv1jdymb8nmsb03sq1svsw5nyag9" + "commit": "df76c35a7c370f34e23f4ad20a22aacce5581165", + "sha256": "0p29hcf0gcswlsy4cy68byys459358v14fzdbz38j1diz5g5ac6p" } }, { @@ -79494,11 +79937,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20190720, - 1439 + 20190919, + 1939 ], - "commit": "ef443866c2f9ad6b2099fe04552a71c654799808", - "sha256": "071k37019v7fx75ssw823rsgzgmicgpnm641qdfz47zagg9b1xg6" + "commit": "967963404824052f25913906f506b090ebba221a", + "sha256": "09p9dcybkabkrdvv0ss9jgbmn87zilgijpxhd0r18qpb5hipyr8g" } }, { @@ -79595,15 +80038,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20190609, - 1123 + 20190912, + 856 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "bc2618a71e0bbef60258cf59bad0796f469a2685", - "sha256": "0ivcp2gvysr6lx0dv2d9g4bsc5sb6h6qjn5b0yr67lbs0r6wrvva" + "commit": "66ea7cc9699d6edc6115daa024818adbd85efc20", + "sha256": "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8" }, "stable": { "version": [ @@ -79626,11 +80069,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190820, - 502 + 20190918, + 505 ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "3543b8404640884d901c719bb83c5474056cf97f", + "sha256": "1k1d3llf150rih8dba2fg7xp9ksnbfzdsj01lziqz396p34sim0f" }, "stable": { "version": [ @@ -80101,8 +80544,8 @@ 20190517, 2037 ], - "commit": "48290d331d923031156bbbaf8360b774bf983d1e", - "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i" + "commit": "af84c0fe9ec13e45f6b7f07caf144607d0b82fca", + "sha256": "1b7lrbx5hk9vxr8zws8vcv3pfr3h0xjmc67kcw2njsjc83p4icwl" }, "stable": { "version": [ @@ -80145,8 +80588,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20190820, - 1448 + 20190919, + 1217 ], "deps": [ "dash", @@ -80160,8 +80603,8 @@ "spinner", "xterm-color" ], - "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e", - "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba" + "commit": "2f89af8886cfb346b136fe60c80e2f4e3de5bb0c", + "sha256": "1gggjg69c0jqyijqgmdbhvhpxspivxp3ljwj2ypzygx2xgmrih1h" } }, { @@ -80199,8 +80642,8 @@ 20190816, 1209 ], - "commit": "539abca4651dda2d667a44f172957df39fa76eb5", - "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc" + "commit": "0bb210f37539e9d0c1e77ae286a0d7db79cf8edf", + "sha256": "1x093wq7srgby3608n3q1vkdfvx9b98q7mzfhxwmy3999y7qhsk5" } }, { @@ -80548,14 +80991,14 @@ "repo": "clojure-emacs/sayid", "unstable": { "version": [ - 20190826, - 1037 + 20190919, + 654 ], "deps": [ "cider" ], - "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261", - "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33" + "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c", + "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9" }, "stable": { "version": [ @@ -80605,8 +81048,8 @@ 20190413, 1246 ], - "commit": "c060053d3b4818bf6d0620b0711be845795c4157", - "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7" + "commit": "497baa7a4f9e688b7c9eb6f16dd57e645202e041", + "sha256": "0ss7wkc46xmwgldhdygx0344zh2c51ny2xbj869sqpky1wi72z4c" } }, { @@ -80953,11 +81396,11 @@ "repo": "emacs-pe/scribble-mode", "unstable": { "version": [ - 20181204, - 325 + 20190912, + 200 ], - "commit": "217945d54de5e4bb207033f2116baa28f5c5ecf2", - "sha256": "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii" + "commit": "5c3ea3cc9bbad585476eee41ea76dc056c2012bb", + "sha256": "0p7mch1z289hjxmdb4w04sdixkqqvjmrrw92yd6akr551yj0jbhx" } }, { @@ -81614,11 +82057,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20190623, - 1123 + 20190909, + 1754 ], - "commit": "e8bfb0e37940bf5f370ae300b896dd04afbc63c8", - "sha256": "0p2hlrsy2s7pkqlsdicbv3jm2bg16nlrwpllqgnvbqss6jrasx17" + "commit": "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05", + "sha256": "16d4kkfmrzc4d0smk9m759mv11bvicixrvwh1za7c6avscg9lym2" }, "stable": { "version": [ @@ -81784,11 +82227,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190818, - 2128 + 20190903, + 1907 ], - "commit": "1887f606db73846d7da6023cb8944efbc791377c", - "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj" + "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff", + "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9" } }, { @@ -82130,8 +82573,8 @@ 20190826, 741 ], - "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", - "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" + "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e", + "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh" } }, { @@ -82473,11 +82916,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20190816, - 303 + 20190903, + 818 ], - "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", - "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" + "commit": "0d23b13938d4443463ee66956bf57e0a459cb166", + "sha256": "1mg0x390nzr844l4zlr4ismkxb9zyy35kg8zjlmy6pcggn7cf82c" }, "stable": { "version": [ @@ -83072,15 +83515,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20190818, - 1634 + 20190920, + 1906 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816", - "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv" + "commit": "ebf170aed587e98d9af75151df1d497e185f5ae0", + "sha256": "0mnw8s073am4inyg271xpsk79v5ha5bc646a9rd3b32152hlwnl7" }, "stable": { "version": [ @@ -83750,11 +84193,11 @@ "repo": "genehack/smart-tab", "unstable": { "version": [ - 20170902, - 2107 + 20190916, + 137 ], - "commit": "76a8ec13384975d39aa1b25e5384a02558dba574", - "sha256": "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3" + "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a", + "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa" } }, { @@ -83806,15 +84249,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20190728, - 2037 + 20190904, + 1742 ], "deps": [ "cl-lib", "dash" ], - "commit": "7080e7fba9f478c2e5d4c18a325c3a5d60f6be76", - "sha256": "029hy609p74w36ivcnw40x6j2v6agjg5bha4k8wbch3wf9y823mz" + "commit": "12856838cf9b0e6a635a6ceb14a22fdc03b04728", + "sha256": "1252j96slvipjlixp9gzlsa5za7zx9a7piz661qmbv6pb812ibfr" }, "stable": { "version": [ @@ -83924,11 +84367,11 @@ "repo": "aaptel/smblog-mode", "unstable": { "version": [ - 20170419, - 1021 + 20190920, + 1823 ], - "commit": "5245e7aeac20915121946f59bba30899305d950b", - "sha256": "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b" + "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a", + "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz" } }, { @@ -84131,28 +84574,28 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20190412, - 228 + 20190912, + 308 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "d49c6580e5e01a5e80198f4026caf1d5a717f8a0", - "sha256": "0lxxd0a735sy4igncf6f0ljk2wy38x2pm1yq90gxymwi26j75ram" + "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", + "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "0cadd2bbd20aae1555561e81ed72fec43ec7296e", - "sha256": "1i4cwdyhfyawfx07i63iqdx524mlphgbrl44wqqnnxrbdqm0h534" + "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", + "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" } }, { @@ -85574,11 +86017,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20190526, - 1227 + 20190909, + 1149 ], - "commit": "a47a40c7c5d39d251bf15e45f184565c5240b33e", - "sha256": "1i3c7y0a7dzvb3c8pk69gvh33945bhm00j0fwl49yh7hg2d9w118" + "commit": "0879e2fe1872fe11c3ddfab631987ed64bb5c437", + "sha256": "0mwy50rydy64zcy9g08b952vjd5ij9gwgcsl6ipaq52kjhs7x8l8" }, "stable": { "version": [ @@ -85726,11 +86169,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20190816, - 2237 + 20190917, + 530 ], - "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110", - "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2" + "commit": "93a0e189a06d49b03627c65fe77652bee9f129d4", + "sha256": "1ijmnn3f6ymm04fbp6xmsvc1nrxgcj0k90462ffyl6adbzv4f82a" }, "stable": { "version": [ @@ -85939,14 +86382,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20171109, - 13 + 20190916, + 627 ], "deps": [ "cl-lib" ], - "commit": "d6ca2a828b0824da51978397e198bf91c51ce793", - "sha256": "16cxws1b3iwm9aqbiip298zsjm6gwjihpvkia4p0zvzynwhflw8q" + "commit": "f32951f4e0a4bc92813d0121d9df0257101b8992", + "sha256": "1fl4875992xxv0amcqj7b516f35k19h8fd7pij0by5b808k5ls6x" } }, { @@ -85990,8 +86433,8 @@ 20171130, 1559 ], - "commit": "143146feada95b8be228d339114f2c469a78bbb9", - "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp" + "commit": "43559408e8340e8fac588c5711c40f7cdca48f96", + "sha256": "1w576zzb0dzffn59bxf14z32vy7rmdj4k8ms2dy7qn4vhmyr38jx" }, "stable": { "version": [ @@ -86052,6 +86495,24 @@ } }, { + "ename": "stock-tracker", + "commit": "5e959303b4c0a07c821252a913b578f70b5f41ad", + "sha256": "1gc4z980rp9s0nvbrbp792ckyw12ahfsk3a3whf12vb3anmmgd7b", + "fetcher": "github", + "repo": "beacoder/stock-tracker", + "unstable": { + "version": [ + 20190902, + 812 + ], + "deps": [ + "dash" + ], + "commit": "c7455081fa78fd8ffa229dcf0c691f66bf2ece16", + "sha256": "19phvf5xcaiwlxx0s8p9ys6xrw6ljp9qxjik98v2ab6d8f2x123q" + } + }, + { "ename": "strace-mode", "commit": "9b2003bee9992d9e79124d95d30b573c8a6bdbfe", "sha256": "16v350nqdxmmk1r4z25bssm436xcm4cvnaxm7f3wxwvmg9z0gx8d", @@ -86561,14 +87022,14 @@ "repo": "aaronbieber/sunshine.el", "unstable": { "version": [ - 20181029, - 1654 + 20190905, + 1832 ], "deps": [ "cl-lib" ], - "commit": "8959dea03377e61aaca0124ac8d2703daaae6b9a", - "sha256": "1shzhl5bi5dkmvc07mc7sknm5id89iivjkcxsrdcw004g08hr8y0" + "commit": "5e57899b2201dd36ae7242aa13ca82efcded3b7c", + "sha256": "1l7mls11k9v524c2f4d2xk6b8gydl5mgrpjf7vnngwz63mdy263n" } }, { @@ -87345,14 +87806,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20190513, - 947 + 20190905, + 619 ], "deps": [ "cl-lib" ], - "commit": "2bd46845b664ae828c8b973839ef454cde501028", - "sha256": "1r1ia1yw43vvyk62d6r1k55zcz185777s10ix9bg3fllczdbyzcz" + "commit": "9bc6dd926bb879cd95ac0def484181f8c6b53419", + "sha256": "0bss78m7x46rdivdz74pygq5vdvsna1aabrdj081g4ay36n6grrj" } }, { @@ -87410,6 +87871,37 @@ } }, { + "ename": "syslog-mode", + "commit": "44b28cc63352e4398a94338d885371226d1e81aa", + "sha256": "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19", + "fetcher": "github", + "repo": "vapniks/syslog-mode", + "unstable": { + "version": [ + 20190913, + 2040 + ], + "deps": [ + "hide-lines", + "ov" + ], + "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", + "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + }, + "stable": { + "version": [ + 2, + 3 + ], + "deps": [ + "hide-lines", + "ov" + ], + "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", + "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + } + }, + { "ename": "system-packages", "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db", "sha256": "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l", @@ -87776,11 +88268,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20190805, - 1153 + 20190919, + 727 ], - "commit": "3f5b0981a87f1c4895961f36e0a67b69ccbbb18d", - "sha256": "194m2rm1yv7jp6nb7mm3m4hyhj81i379ky7ifaisrvc1jm3dwp6n" + "commit": "c95fb2375b0c8d448a347241eb95f160e6880e99", + "sha256": "18qdnjxr4p4a2ds4k7sk5kkykyxcfri8zws3bhisfz1kayad1wlg" }, "stable": { "version": [ @@ -87792,6 +88284,25 @@ } }, { + "ename": "taskrunner", + "commit": "f0e0354a4da2e675406068d158c7e532cd5ed083", + "sha256": "0dyqqlafzxn0irmqwfh9rjysn1vm0wxlapg3pzgqps1w4mkkvwc5", + "fetcher": "github", + "repo": "emacs-taskrunner/emacs-taskrunner", + "unstable": { + "version": [ + 20190916, + 1608 + ], + "deps": [ + "async", + "projectile" + ], + "commit": "716323aff410b4d864d137c9ebe4bbb5b8587f5e", + "sha256": "03llmj09jg5cba927qbzkhld83k24yd1i95nfiq7q754a4y4iksn" + } + }, + { "ename": "tawny-mode", "commit": "ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c", "sha256": "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr", @@ -87799,14 +88310,14 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20170422, - 2202 + 20190912, + 1357 ], "deps": [ "cider" ], - "commit": "1be07e047343a1bdbb1a8ca40ff6ed3fbb585dec", - "sha256": "1x6544hk87pxlvjv136wi3ixswpd621zjmv20c85bxj8zaasc80n" + "commit": "217ca22fdff89a2bbe23d67afd43c06f928de826", + "sha256": "0w16icw1g1naaasvnjaggjvqyfbbwmc4xlw928dnqyfyys2a4j60" }, "stable": { "version": [ @@ -87957,26 +88468,26 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190830, - 1446 + 20190920, + 1329 ], "deps": [ "visual-fill-column" ], - "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9", - "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw" + "commit": "54a340d891ce3c99d2eb51d43cdfe7531708128d", + "sha256": "0421xy85vzf443ildd6sn9srifw86kh7v2vn4wg1c91s0y3sq0y7" }, "stable": { "version": [ 0, 4, - 0 + 4 ], "deps": [ "visual-fill-column" ], - "commit": "529003333797fade89a04a8b3fba9099f6585c08", - "sha256": "1a5fxix2zvs461vn6zn36qgpg65bl38gfb3ivr24wmxq1avja5s1" + "commit": "4457087e1e34e7340d3678714807335665d798d8", + "sha256": "0s2a9hwa775qyfad1zikah0vnpn9mbydzf8ipsyabns2hhjzf225" } }, { @@ -88409,8 +88920,8 @@ "cl-lib", "json" ], - "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6", - "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd" + "commit": "556f5559255518865456af0b228f86bfabd43e6b", + "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm" }, "stable": { "version": [ @@ -88442,8 +88953,8 @@ "cl-lib", "tern" ], - "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6", - "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd" + "commit": "556f5559255518865456af0b228f86bfabd43e6b", + "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm" }, "stable": { "version": [ @@ -88967,8 +89478,8 @@ 20180905, 1050 ], - "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3", - "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf" + "commit": "21ef6dc0625e6befbffbd5878265ee9985406151", + "sha256": "012kfjjb5jpzairp17cdafry8mw5v8w2dqplzhx41bw18y88qv67" }, "stable": { "version": [ @@ -89416,11 +89927,11 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20190603, - 803 + 20190902, + 1055 ], - "commit": "2539b4be401d006e2752f6ad3b88e696889a7fc8", - "sha256": "1d9jj6vgz5f29xqbx1hh0nxkzbql66z3ygxrksry0xjyxabcmnc2" + "commit": "379b457fcff091d2fa47223ade58f457fd6eed28", + "sha256": "1pbc4ni9sw99r6z9zm1khlyvf1sxy1813ilv73ai7q2619y6njja" }, "stable": { "version": [ @@ -89514,8 +90025,8 @@ "deps": [ "cl-lib" ], - "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", - "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" + "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b", + "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a" } }, { @@ -89900,14 +90411,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20190812, - 1336 + 20190905, + 1138 ], "deps": [ "dash" ], - "commit": "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25", - "sha256": "1xyj9ncqz0mrdgn6wg252p8kv2k9h391ni0bvkw8dqwz7xwgfl3g" + "commit": "7bf97594a5ec1b9a682ef5a1537a6b0ecc6d9dfb", + "sha256": "08crxnha8rwkv0npdb624v3xxy50bcb0s8pwm1vvz7ahpzyp7gza" }, "stable": { "version": [ @@ -90042,8 +90553,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190826, - 1125 + 20190916, + 913 ], "deps": [ "ace-window", @@ -90055,8 +90566,8 @@ "pfuture", "s" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "dba721a03451802872cb783569a6782504a295c3", + "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h" }, "stable": { "version": [ @@ -90092,8 +90603,8 @@ "evil", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "dba721a03451802872cb783569a6782504a295c3", + "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h" }, "stable": { "version": [ @@ -90123,8 +90634,8 @@ "cl-lib", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "dba721a03451802872cb783569a6782504a295c3", + "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h" }, "stable": { "version": [ @@ -90155,8 +90666,8 @@ "pfuture", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "dba721a03451802872cb783569a6782504a295c3", + "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h" }, "stable": { "version": [ @@ -90187,8 +90698,8 @@ "projectile", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "dba721a03451802872cb783569a6782504a295c3", + "sha256": "1cqii0i8ka8n5nrxrid7rg2xdcq994sdaabbiy4lcs1dynwlyp9h" }, "stable": { "version": [ @@ -90357,15 +90868,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20190819, - 102 + 20190918, + 241 ], "deps": [ "dash", "s" ], - "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8", - "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735" + "commit": "395649a2f2ba79028331bb1fa9ec08b218950ff6", + "sha256": "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a" }, "stable": { "version": [ @@ -90714,11 +91225,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20190710, - 2011 + 20190918, + 1042 ], - "commit": "32146510b8ebb031e468c6c0898a9b253c73617e", - "sha256": "1yhzlgq73px45wy9pz9rx5al510mgzq2bz3rh4j50wpwvl13ja5r" + "commit": "1bafd279cf5161476aa540267ea0a45684749cbd", + "sha256": "04wm5rd8zjwd91k87l705f4icvvaiykb2fn3gfhpyglm1apfmcqp" }, "stable": { "version": [ @@ -91037,11 +91548,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20190824, - 1554 + 20190909, + 427 ], - "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c", - "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny" + "commit": "47b7df0c97ad0099537d1ade21c4c52f0618a945", + "sha256": "078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9" } }, { @@ -91476,8 +91987,8 @@ "deps": [ "dash" ], - "commit": "c37728e11dedd29d849ba9523465b0cdaccea9d5", - "sha256": "0sp3kcqqj5km6nw6kinhg780vj3bjwf2zj52pmfwpfk8xiy6km5y" + "commit": "1e4b1e7f44f242a6cdcce0c157d07efe667b7bef", + "sha256": "16ic97lpw1d9bqcc0fvzv2n62xb5rlpi92cha3jpy7flbp8ys143" } }, { @@ -91592,8 +92103,8 @@ "deps": [ "bind-key" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91624,8 +92135,8 @@ "key-chord", "use-package" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91686,8 +92197,8 @@ "system-packages", "use-package" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91784,17 +92295,17 @@ 20190715, 1836 ], - "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", - "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" + "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", + "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" }, "stable": { "version": [ 2, 4, - 1 + 2 ], - "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", - "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" + "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", + "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" } }, { @@ -92052,20 +92563,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20190701, - 1115 + 20190910, + 2008 ], - "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66", - "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2" + "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac", + "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm" }, "stable": { "version": [ 1, - 6, - 9 + 8 ], - "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66", - "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2" + "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac", + "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm" } }, { @@ -93076,11 +93586,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190830, - 742 + 20190920, + 1116 ], - "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", - "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" + "commit": "c9cdb7e3075ddfc9aef356d42b376ebbb039bc7e", + "sha256": "1vg43ln70kifk3h0rwmj7w85mksg1yl3z4kqfq9q5zalp9jgwfsh" } }, { @@ -93168,11 +93678,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20190828, - 916 + 20190910, + 1011 ], - "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd", - "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql" + "commit": "23237fc2c255de798b8d3fc2cb68c7c22b53caa9", + "sha256": "1s5n2gcldwj5srjn44pigd788x0hv4c7lz75krqyz1hysriydv9p" } }, { @@ -93253,14 +93763,14 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20190812, - 818 + 20190919, + 859 ], "deps": [ "semi" ], - "commit": "ba07b99ee146c7945823874102e7db38e7aa8bd0", - "sha256": "14fp8s1baq3r6gxaf1c50zyk59bnzpnpbpxnp3lvcz1a1i5377ql" + "commit": "7a919e422a48f5021576e68282703de430558879", + "sha256": "0k2jklkpqm33bimxy4vnssdc9xa7wfnvay3ng0av1bwxfgxfrmdr" } }, { @@ -93497,11 +94007,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20190625, - 1951 + 20190916, + 1858 ], - "commit": "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4", - "sha256": "1vsm95v47xk63gxg08w8bxlg91l2yqbgqwgaa5706x65q0rzv0xm" + "commit": "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69", + "sha256": "1552wq8v4d0pj00kyhc05a4wq0p639r5yxa0rf6y3n4vy94190ql" }, "stable": { "version": [ @@ -94094,20 +94604,20 @@ "repo": "whizzml/whizzml-mode", "unstable": { "version": [ - 20190802, - 1637 + 20190920, + 2342 ], - "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", - "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" + "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", + "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" }, "stable": { "version": [ 0, - 34, + 35, 0 ], - "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", - "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" + "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", + "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" } }, { @@ -94549,15 +95059,15 @@ "repo": "deb0ch/emacs-winum", "unstable": { "version": [ - 20181119, - 1705 + 20190911, + 1607 ], "deps": [ "cl-lib", "dash" ], - "commit": "247df36c03d70b453e9b912d6e1b7065644f639d", - "sha256": "0xbbf35cpbp5mayq5497g6m7l264vlf5p612mpz81yd55xs9pi7k" + "commit": "c5455e866e8a5f7eab6a7263e2057aff5f1118b9", + "sha256": "0lj4cp7ml7cjhkd66f6ivcl6sbfs2my8ajjlynzl3pm5qansfw5i" }, "stable": { "version": [ @@ -94690,27 +95200,27 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20170821, - 617 + 20190913, + 1524 ], "deps": [ "s", "seq" ], - "commit": "af9a38ce28a741e6d8742750bef5d7b5afa13796", - "sha256": "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7" + "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", + "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" }, "stable": { "version": [ 2, - 2 + 4 ], "deps": [ "s", "seq" ], - "commit": "9efeb236c8f6887a8591d6241962c37266d8e726", - "sha256": "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g" + "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", + "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" } }, { @@ -95760,25 +96270,25 @@ "repo": "NicolasPetton/xref-js2", "unstable": { "version": [ - 20170530, - 826 + 20190915, + 2032 ], "deps": [ "js2-mode" ], - "commit": "d5f93605405989529c2f66b542def6c32429b927", - "sha256": "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53" + "commit": "6f1ed5dae0c2485416196a51f2fa92f32e4b8262", + "sha256": "0pbnhliq3zivijksdhdqd7m3ndc3z7kw2g21zwihq28faps96ikj" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "js2-mode" ], - "commit": "7e2bc6a8dad08a493d11d3554f6374584846b9e6", - "sha256": "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd" + "commit": "d48253bf1999815329a294d09f0b1b744a6272ae", + "sha256": "0kg1vdyjd0n48cb8bvjqskzd79s3bgdcpzn80gm2y78m280kakn8" } }, { @@ -96131,11 +96641,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20190824, - 1946 + 20190904, + 1507 ], - "commit": "c364607804e943b301ded8a30d7e19dda217568a", - "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m" + "commit": "2f110f4aacb00c58439385cabb18cfaa8d759e64", + "sha256": "1hwmap0z4jjfs5lwmr0zrybzvx49qbqa957wg21l8h31pq40d3k5" }, "stable": { "version": [ @@ -96328,14 +96838,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20190821, - 901 + 20190908, + 1137 ], "deps": [ "yasnippet" ], - "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", - "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" + "commit": "676a6ddc190fb957dca3c42a777e34a623f15cbd", + "sha256": "14208jiymdz7pa6yx6is9fip3myhqgb7wjby7f27x73iv4rvkvkp" }, "stable": { "version": [ @@ -96386,11 +96896,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20190525, - 548 + 20190911, + 27 ], - "commit": "714f3527b4a16daf7a811dcc7b344ac989064f52", - "sha256": "12sqy2wrlgzi71vn3q5h47z1i6l6di3pnr4pmn0ixdp500gvy2fv" + "commit": "9e07513fc2efd1e60e00bff1832ca77ec644166c", + "sha256": "0bs1kizsn2cp26ssj84pk1xqabrvc5kpl4689sjxc4vihfayzd5l" } }, { @@ -96598,8 +97108,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20180714, - 414 + 20190916, + 313 ], "deps": [ "chinese-word-at-point", @@ -96607,8 +97117,8 @@ "popup", "pos-tip" ], - "commit": "9496ea3ba8aa999db3dbde88d6aa37f3579d8dea", - "sha256": "0kn07ksjdrwl0m1wiac83ljg5drrmyf65gxm4m6r3iz1awd1akbb" + "commit": "c8c76a1584c9a39ab5df7bba3ba3c728cbd30bb2", + "sha256": "07vngrn17x91anhwvnaa7ryfipgszipaghnj1404yik9w9j9mff9" }, "stable": { "version": [ @@ -96818,15 +97328,13 @@ "stable": { "version": [ 4, - 5 + 6 ], "deps": [ - "all-the-icons", - "flycheck", - "magit" + "all-the-icons" ], - "commit": "ceb46240636865e86f3fe26906957943ba7bd73c", - "sha256": "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m" + "commit": "df22536a244293591575e56970bf83814faa7c14", + "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6" } }, { @@ -97043,8 +97551,8 @@ 20190523, 1300 ], - "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54", - "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp" + "commit": "e2aad25dfd334299a7e53df21796b8652142c5b5", + "sha256": "0nr21gmji24bn5j73hrl8qy9llv3cmc9w5j30pcnsi4zi2svh9gc" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index be20800cde2..bca85c01016 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip , coreutils, gnugrep, which, git, unzip, libsecret, libnotify }: @@ -28,7 +28,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; - patchPhase = '' + patchPhase = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -63,7 +63,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret @@ -77,4 +77,6 @@ with stdenv; lib.makeOverridable mkDerivation rec { ln -s "$item/share/applications" $out/share ''; +} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) { + preferLocalBuild = true; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a33b9531730..ebdfb09936a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl , python -, jdk, cmake, libxml2, zlib, python3, ncurses +, jdk, cmake, libxml2, zlib, python3, ncurses5 }: with stdenv.lib; @@ -34,7 +34,7 @@ let lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5 patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ @@ -134,7 +134,7 @@ let as IntelliJ. ''; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }); @@ -201,11 +201,11 @@ let platforms = platforms.linux; }; }) (attrs: { - patchPhase = attrs.patchPhase + '' + patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' # Patch built-in mono for ReSharperHost to start successfully interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen - ''; + ''); }); buildRubyMine = { name, version, src, license, description, wmClass, ... }: diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 7d558dfb893..6808d7115c5 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let neovimLuaEnv = lua.withPackages(ps: - (with ps; [ mpack lpeg luabitop ] + (with ps; [ lpeg luabitop mpack ] ++ optionals doCheck [ nvim-client luv coxpcall busted luafilesystem penlight inspect ] @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.3.8"; + version = "0.4.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; + sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"; }; patches = [ @@ -41,14 +41,15 @@ in enableParallelBuilding = true; buildInputs = [ + gperf libtermkey libuv + libvterm-neovim + lua.pkgs.luv.libluv msgpack ncurses - libvterm-neovim - unibilium - gperf neovimLuaEnv + unibilium ] ++ optional withJemalloc jemalloc ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -77,8 +78,9 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DGPERF_PRG=${gperf}/bin/gperf" + "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" + "-DLUA_PRG=${neovimLuaEnv.interpreter}" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 92ff745d1a6..6ad3983a531 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.2.0"; + version = "2.2.1"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x"; + sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7273b7252ca..09baf383f97 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: +{ stdenv +, lib +, fetchurl +, makeWrapper +, electron_5 +, dpkg +, gtk3 +, glib +, gsettings-desktop-schemas +, wrapGAppsHook +, withPandoc ? false +, pandoc +}: stdenv.mkDerivation rec { pname = "typora"; @@ -42,10 +54,11 @@ stdenv.mkDerivation rec { makeWrapper ${electron_5}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; license = licenses.unfree; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3f922530e73..88cff0035c7 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "11.1.4"; + version = "11.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q"; + sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9af1a0fc914..b0e76d23dac 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8"; + sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7ae5286f762..7130d21b8ef 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec { sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy"; }; - propagatedBuildInputs = with python27Packages; [ pygtk pillow ]; + propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ]; doCheck = false; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 241bb71983a..76d4e989e8c 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -15,6 +15,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedUserEnvPkgs = [ baloo ]; propagatedBuildInputs = [ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index c29d8684c90..099b06c078d 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "cointop"; version = "1.3.4"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n"; }; - modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg"; + goPackagePath = "github.com/miguelmota/cointop"; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 2e821701216..ffa9b4d071b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.1.5"; + version = "6.2.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m"; + sha256 = "1ix6isahpk7zk741wdx5cf4i13wc5gp0j1gj4ja80bzfswbc38na"; }; installPhase = '' diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 3170a63379c..64cad5c0292 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh", - "version": "1.4.10-848554d6", - "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh", + "version": "1.4.11-a12e5bad", + "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn" } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 09089a072b3..142dafe38eb 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,42 +1,64 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }: +{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell +, qtbase, qtsvg, qttools, qmake +, boost, muparser }: -stdenv.mkDerivation rec { - version = "2.1.3"; +mkDerivation rec { pname = "librecad"; + version = "2.2.0-rc1"; - src = fetchurl { - url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; - name = "${pname}-${version}" + ".tar.gz"; - sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; + src = fetchFromGitHub { + owner = "LibreCAD"; + repo = "LibreCAD"; + rev = version; + sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; }; - patchPhase = '' - sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh - sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp + patches = [ ./fix_qt_5_11_build.patch ]; + + postPatch = '' + substituteInPlace scripts/postprocess-unix.sh \ + --replace /bin/sh ${runtimeShell} + + substituteInPlace librecad/src/lib/engine/rs_system.cpp \ + --replace /usr/share $out/share + + substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ + --replace __DATE__ 0 ''; - qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ]; + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" + ]; installPhase = '' - install -m 555 -D unix/librecad $out/bin/librecad - install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop - install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml - install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ + runHook preInstall + + install -Dm555 -t $out/bin unix/{librecad,ttf2lff} + install -Dm444 -t $out/share/applications desktop/librecad.desktop + install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png + install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml + install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ $out/share/icons/hicolor/scalable/apps/librecad.svg + + installManPage desktop/librecad.? + cp -R unix/resources $out/share/librecad + + runHook postInstall ''; - buildInputs = [ qt4 muparser which boost ]; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; + buildInputs = [ boost muparser qtbase qtsvg ]; + + nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ]; enableParallelBuilding = true; - meta = { - description = "A 2D CAD package based upon Qt"; - homepage = https://librecad.org; - repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + meta = with lib; { + description = "2D CAD package based on Qt"; + homepage = "https://librecad.org"; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch new file mode 100644 index 00000000000..04701e5ab1e --- /dev/null +++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch @@ -0,0 +1,36 @@ +diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp +index 835e47d..2c878e8 100644 +--- a/librecad/src/ui/forms/qg_commandwidget.cpp ++++ b/librecad/src/ui/forms/qg_commandwidget.cpp +@@ -27,6 +27,7 @@ + + #include <algorithm> + ++#include <QAction> + #include <QKeyEvent> + #include <QFileDialog> + #include <QSettings> +diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp +index 2beaceb..84068ad 100644 +--- a/librecad/src/ui/generic/colorwizard.cpp ++++ b/librecad/src/ui/generic/colorwizard.cpp +@@ -27,6 +27,7 @@ + #include "colorwizard.h" + #include "ui_colorwizard.h" + ++#include <QAction> + #include <QColorDialog> + #include <QLineEdit> + #include <QListWidget> +diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp +index 7c35144..0e394f2 100644 +--- a/librecad/src/ui/generic/widgetcreator.cpp ++++ b/librecad/src/ui/generic/widgetcreator.cpp +@@ -27,6 +27,7 @@ + #include "widgetcreator.h" + #include "ui_widgetcreator.h" + ++#include <QActionGroup> + #include <QSettings> + #include <QLineEdit> + #include <QPushButton> diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 9eb4a0897d4..b84bc08ddb3 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 98d5ef72b22..f084d17e389 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index d6153d2268b..12a0720e447 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }: let - version = "0.9.2"; + version = "0.9.3-3"; name = "mucommander-${version}"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = version; - sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; + sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can"; }; postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \ - --replace "revision = git.head().id" "revision = 'abcdefgh'" + --replace "revision = git.head().id" "revision = 'abcdefgh'" \ + --replace "proguard.enabled =" "// proguard.enabled =" \ + --replace "version = '0.9.4'" "version = '${version}'" # disable gradle plugins with native code and their targets perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle @@ -34,7 +36,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src postPatch; - nativeBuildInputs = [ gradle_3_5 perl ]; + nativeBuildInputs = [ gradle_4_10 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -47,12 +49,12 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7"; + outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j"; }; in stdenv.mkDerivation { inherit name src postPatch; - nativeBuildInputs = [ gradle_3_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -63,7 +65,7 @@ in stdenv.mkDerivation { repositories { mavenLocal(); maven { url '${deps}' } } #" {} \; - gradle --offline --no-daemon build + gradle --offline --no-daemon distTar ''; installPhase = '' diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index deecc92d993..6a6c95b6572 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz"; - sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; + sha256 = "0qha7jvkdmil3jiwrpsfhkqsbkqn9dzgx3ayxwjdmv73ikmg95j6"; }; buildCommand = '' diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix new file mode 100644 index 00000000000..30e68a89a1c --- /dev/null +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -0,0 +1,49 @@ +{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "pdfsam-basic"; + version = "4.0.4"; + + src = fetchurl { + url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; + sha256 = "17lhzxlgr4l4dljy0b0avfrgbj9rsfzk1dzg0abqvld4w4igkqbq"; + }; + + unpackPhase = '' + ar vx ${src} + tar xvf data.tar.gz + ''; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ glib ]; + + preFixup = '' + gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + ''; + + installPhase = '' + cp -R opt/pdfsam-basic/ $out/ + mkdir -p "$out"/share/icons + cp --recursive ${desktopItem}/share/applications $out/share + cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = "PDFsam Basic"; + genericName = "PDF Split and Merge"; + mimeType = "application/pdf;"; + categories = "Office;Application;"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ maintainers."1000101" ]; + }; +}
\ No newline at end of file diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 6a16741a06b..87125eb1b36 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,64 +1,75 @@ -{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: +{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper +, stdenv, udev, wrapGAppsHook }: -stdenv.mkDerivation rec { +let + inherit (stdenv.hostPlatform) system; - name = "simplenote-${pkgver}"; - pkgver = "1.1.3"; + pname = "simplenote"; - src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; - sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; - }; + version = "1.8.0"; - buildCommand = let - - packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf - xorg.libxcb - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - - in '' - mkdir -p $out/share/ - mkdir -p $out/bin - tar xvzf $src -C $out/share/ - mv $out/share/Simplenote-linux-x64 $out/share/simplenote - mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote - mkdir -p $out/share/applications - - cat > $out/share/applications/simplenote.desktop << EOF - [Desktop Entry] - Name=Simplenote - Comment=Simplenote for Linux - Exec=$out/bin/simplenote - Icon=$out/share/simplenote/Simplenote.png - Type=Application - StartupNotify=true - Categories=Development; - EOF - - fixupPhase - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/share/simplenote" \ - $out/share/simplenote/simplenote - - ln -s $out/share/simplenote/simplenote $out/bin/simplenote - ''; + sha256 = { + x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl"; + }.${system}; meta = with stdenv.lib; { description = "The simplest way to keep notes"; - homepage = https://github.com/Automattic/simplenote-electron; - license = licenses.lgpl2; + homepage = "https://github.com/Automattic/simplenote-electron"; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; platforms = [ "x86_64-linux" ]; }; -} + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = + "https://github.com/Automattic/simplenote-electron/releases/download/" + + "v${version}/Simplenote-linux-${version}-amd64.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "simplenote"; + comment = "Simplenote for Linux"; + exec = "simplenote %U"; + icon = "simplenote"; + type = "Application"; + startupNotify = "true"; + desktopName = "Simplenote"; + categories = "Development"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; + + buildInputs = atomEnv.packages; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ udev.lib ]; + + postFixup = '' + ls -ahl $out + makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ + "''${gappsWrapperArgs[@]}" + ''; + }; + +in + linux diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 0332de0195c..f65f5bc26e8 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; }; + preferLocalBuild = true; + patches = [ ./java-env-config-fixes.patch ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 45fb820a076..ae3659a21fe 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.68.131"; + version = "0.69.128"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l"; + sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6d43c313cc0..4353d2958f5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,6 +138,13 @@ let ./patches/jumbo-sorted.patch ./patches/no-build-timestamps.patch ./patches/widevine.patch + # Revert "Implement GetFallbackFont on Linux" to fix a performance regression + # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed + (fetchpatch { + url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch"; + sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy"; + revert = true; + }) # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. @@ -227,8 +234,9 @@ let use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; - # at least 2X compilation speedup - use_jumbo_build = true; + # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken: + # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9 + use_jumbo_build = (version != "78.0.3904.17"); proprietary_codecs = false; use_sysroot = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f099ddbff73..5fb0d67a480 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -50,6 +50,7 @@ in let widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { name = "chromium-binary-plugin-widevine"; + # The .deb file for Google Chrome src = upstream-info.binary; nativeBuildInputs = [ patchelfUnstable ]; @@ -57,14 +58,21 @@ in let phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let - chan = if upstream-info.channel == "dev" then "chrome-unstable" - else if upstream-info.channel == "stable" then "chrome" - else if upstream-info.channel == "beta" then "chrome-beta" - else throw "Unknown chromium channel."; + soPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/libwidevinecdm.so" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/libwidevinecdm.so" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + else + throw "Unknown chromium channel."; in '' mkdir -p plugins - ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ - ./opt/google/${chan}/libwidevinecdm.so + # Extract just libwidevinecdm.so from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath} + mv plugins/${soPath} plugins/ + rm -rf plugins/opt ''; doCheck = true; @@ -83,7 +91,10 @@ in let "$out/lib/libwidevinecdm.so" ''; - meta.platforms = lib.platforms.x86_64; + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; }; suffix = if channel != "stable" then "-" + channel else ""; @@ -92,18 +103,21 @@ in let version = chromium.browser.version; - # This is here because we want to add the widevine shared object at the last - # minute in order to avoid a full rebuild of chromium. Additionally, this - # isn't in `browser.nix` so we can avoid having to re-expose attributes of - # the chromium derivation (see above: we introspect `sandboxExecutableName`). + # We want users to be able to enableWideVine without rebuilding all of + # chromium, so we have a separate derivation here that copies chromium + # and adds the unfree libwidevinecdm.so. chromiumWV = let browser = chromium.browser; in if enableWideVine then runCommand (browser.name + "-wv") { version = browser.version; } '' mkdir -p $out - cp -R ${browser}/* $out/ - chmod u+w $out/libexec/chromium* - cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ - # patchelf? + cp -a ${browser}/* $out/ + chmod u+w $out/libexec/chromium + if [[ ${channel} != "dev" ]]; then + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ + else + mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64 + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/ + fi '' else browser; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index df2ce798f1f..b641d1163bc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb"; - sha256bin64 = "0d9w869qqwbmw3qjvxkfm37i7dvrgmrwm5y96sm1dg2jnxqj4bdz"; - version = "77.0.3865.75"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd"; + version = "77.0.3865.90"; }; dev = { - sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; - sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; - version = "78.0.3887.7"; + sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l"; + sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75"; + version = "78.0.3904.17"; }; stable = { - sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb"; - sha256bin64 = "1wp5g09czyslkkhw3nhbp39fxfcz0pprsgj8h0aggghpdbvzph3d"; - version = "77.0.3865.75"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl"; + version = "77.0.3865.90"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 38670735110..93259332bfb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0"; + version = "69.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ach/firefox-69.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e"; + sha512 = "100d7c9523102d3c4fc07ccb3950a9bf6caa096061c9b5e49d960f89ad6e2a8aa032e8a91ddd4bdda1d4eb8442ceb393dc6b31da11c5a86bfe9c7907bdf3a566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/af/firefox-69.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4"; + sha512 = "ed6e066bd58d84d8e9a240e02b984ab7a52e1646dc4bad7470666e26aebb004b6ef5d43397457c82b4a7b0fa04ad0cc7dcbb662ad721e3c82563104955502627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/an/firefox-69.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15"; + sha512 = "7b75c42de08df56741778a0b01345238fa276ef2012b06cdfa54159b8559b37910b50277335d68d7b0870de36a04c24fcd83132999faa9d7c4e089511018acce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ar/firefox-69.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1"; + sha512 = "7f0266be9bb2b34189ee2891be11907720a248fbd11855d5a99bf54ef439756ecbd201a4d52a21b24b89ec23f1254b4ab15fd02d7511fcfb7d71eca9adf3a852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ast/firefox-69.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f"; + sha512 = "d4681a2280549b3fb0384b5ae6a98ad9785921fa65d4a83fa967fe2d05363ed0ba8348a7621c0cc104a2da9efd97feddb38ef1ac6901c08ae3d9dd649e5ad30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/az/firefox-69.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8"; + sha512 = "c19cedc18719ad6d5723a546be1e9d3aac2e408fcb94fba28aec9e1856250257422407cb945cf516bd0f86ebc1ebd1c06c28713cc6ff49691542fde660fab53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/be/firefox-69.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a"; + sha512 = "e6e4ae0eae225ff64595df0c7038c750c8b3b245c9aa76afdf3e8a2ad9fbb6e324630c73801974f515ccbe315fffe797df3e087412c46e2507507c88311c8a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bg/firefox-69.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a"; + sha512 = "4d2869b82e4f577acc0933e828f72856c55c4d0771bd938a888cbcb6af5ca319f03510cc96249f220d31b6786426c40726e1509beb40633d995bcdeae8299c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bn/firefox-69.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453"; + sha512 = "b01ecf839f6c1e028593c0338132931b39af29b2cbb414d08b29379832300abf4a423566935946b52d4ad4aa04d9d670e41cc11f1989b1e913201f8bc631f786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/br/firefox-69.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d"; + sha512 = "62e0603e9fec08ff0babf25ad38aad703806b43f8b1aa4b986f41a74623fd59dc18b6b230219ac93767924264a45f7ffdc6c41243e888bef786e0e14d6631718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bs/firefox-69.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a"; + sha512 = "c2020ea412b0852f7904ea9371bd3851bda9e0cf006a582a1427e8c9e412991bce7a0a6febf0632ee58a9da10c7b329cafc30caa8dcb5a2b12837465886be175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ca/firefox-69.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548"; + sha512 = "35c4a61866b37d7afb1cb5e78997b5467bf1d9810db7d4b651d4144132c6b52b6dc5091217787a6a71088b814c3454757eb4f741ec3c3c24462892da77600f73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cak/firefox-69.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff"; + sha512 = "273c8f0e40187f88368e4049a66052b230594939c85ee00e48dfd7760a4093735f91bf4e3eeb14d1c92266068c9994599d3a3cc271206e449e715c1c3d038aad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cs/firefox-69.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52"; + sha512 = "3dc3657c494f3b954236dd330e2c2137b5500bea5a0b4ef2052c7050c0ab23e9b773090843d459c9c259d0eceae0524b0e4ebf6f02883d8419bd05901943d9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cy/firefox-69.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17"; + sha512 = "9ba021a9df417c36b8ee10afaa95595d19897d11485407e9e3fb446c16a1cd31c683014917da608a721a583efd008c0771d13c642c8d94913bcc21227966ae6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/da/firefox-69.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed"; + sha512 = "c6eb2a98e0dd59dfe196d0b8f149aff109e1272199e215fd09d14a614697bc8652fb0442505cfae8a9f2bc0dbeec00bbbe73a7bc737e534f2f230a356137835b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/de/firefox-69.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3"; + sha512 = "a689581f54c278d217c7ae12d770ad1caa686db1fb5138ab3a34c14848b717256d0f09ba8cb5bbcb2472fec73b01e0a5aa4d5b869c7a2f388d8d54b2216b68da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/dsb/firefox-69.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81"; + sha512 = "d33f730bb3727756f982bdcd35e0858cd0d5252594e14ed670324c9d5a1b4a87aa1391bf1e58759a0adf9fae896aa8de7a3258267b40dd96e957efaeeb9abd4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/el/firefox-69.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048"; + sha512 = "4d040b92aa3f06e718ffe0f2dcd477d915dd3959087d0e98bffa7b14fcdd86a74b50be23df1f47ceb4ff9c63564d09a22217bb91f4eb3419b77c0dca12a1bebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-CA/firefox-69.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8"; + sha512 = "390700c7d7fb2c38d6082e91b6c5ad4d1cc4912eb88ae3f207745e88c72ca6a169612be19d984438dd784e8b2e56ca2ea6ab9a3fa1fe6e8253f3e96278eb3dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-GB/firefox-69.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47"; + sha512 = "d719c4c84a62fbaac67ee90812e6922f5b5b7ba08916740d06bf4780d818698a3c46e82c483d0ecd8b4ea040c53a69aebf31ce8c8c4e68dc32e0e27032704c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-US/firefox-69.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f"; + sha512 = "ccf48f7ef61bebabe3e583e2d08a5c9ced3ea4c10b7d4febd64108cb89c9905076d69482056ee5a20dcc6c2e9bba9fee6d3f02eb54a390f0df444e24b3fd8443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eo/firefox-69.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e"; + sha512 = "4ddb06d38c53e24fba796a16676b85d74713a3c324b8f44bc66cd2ab8d3a26204627e0be0b0fddb27ff414360330fba78dcba2ee0cc9691621a1e4ccd7a3d046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-AR/firefox-69.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0"; + sha512 = "e00e8bccd62a45ea959d0d826dc814964b4953343284e4d54d0acb4623d2369e7efdc96cf61028f8309bfcddb9deec4ce20ba10c3613e4a6e686ded9617ec1bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-CL/firefox-69.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3"; + sha512 = "63bbce2c62e331ac92c7501e80d661edd686ff7feae714c32e1dcb8afec829bbfb0ed188138b5655ce5ba479767a58ffae1a367703f80c683c371f707286623e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-ES/firefox-69.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9"; + sha512 = "90c11f172ecb14a38e851558ace78ffd81a0ad10966e9b338c2394485c6460f81ab9f83824e204cab212d77cc56d066d8ddfd9686a3f6791ae9a8d99009d6b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-MX/firefox-69.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e"; + sha512 = "13660d6449512791b4e8cf2b5d7f658d5716c1de5ae80f43893be351ee0de71ad21b135902056422325f9367e778ee31006f9120bbaeed19e9e3af36a20a7a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/et/firefox-69.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316"; + sha512 = "db6ae24e866a32802e9ba9fd35b5fb7bdb63e1f0c8c3aa74d97d6d3e732123a10260794e03af30bac13c71d82b71d72057c0c32697f5efb78d35f55c088f6514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eu/firefox-69.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6"; + sha512 = "da166bd2be438b767af8c3566a7721a50df66572182c5504654be234b486027e1044186e3d2dcb43b2505ccb989f91556d19228f5e30ff4a05beb6f18911cb3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fa/firefox-69.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52"; + sha512 = "c05f526f70225dd91bd38b1d74fbf0217b12919173582262739fbd97b4b556c3d820ee38bb0c33da37cfb26996a882ebc3498faa21141290722eb07dc586b878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ff/firefox-69.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1"; + sha512 = "15385e03ad168f2be63fc30c871617d7d673b53181bea0d592b48d52c172d74b978e84cf1403272e5fa9fe03900f8d1118f9ccf1dd70cf0a7da7af7ddd6fad4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fi/firefox-69.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5"; + sha512 = "fca2397499ab573ff33f14dc2ad61ccd4d0ca711493545e39fba143e65e2d883d9b7317330ca8b8bc7345d74ee5eaea277cef5f1b88b1456b99c8b5f6bc5ad52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fr/firefox-69.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1"; + sha512 = "262f3abd56f9f5b1b6a90f779c1ec233c684a1a71b783eb8fdace2bcd323fa8328dff5312e43458be1418d77109f7e677e9442dc10289064179955015f076fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fy-NL/firefox-69.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7"; + sha512 = "3159e601d22b6b3f5e0d80d0950d03f9f707903a378abe622acc88c1dfccd7bb3d439b370d186460ad4197dade467fa153573da2efef31825f757bc5f5aa1912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ga-IE/firefox-69.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9"; + sha512 = "46ac2bd25b600d801d2ff34b9b802a5830ec69fa69315c98217350462104eb73215ef8130f2987fdf8900ef45c91ea0618ba40ee8916406fb579b41462dc1a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gd/firefox-69.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d"; + sha512 = "ad36cd4d42a29c9ab9d9e7e15e1827fd2ee7799f0484698c62bfba5acd2b0db89f66f7d40a5cf55012708e756cee43653211dff95c28a5a04173c83c45b0e4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gl/firefox-69.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f"; + sha512 = "46ce314704d19f6572568b3a01e975a01c63bb075f8d99c7e04ae01982ac42d61cde92619beb30c04a778f009c56f98e2c05d7549d4ab9843349f85321532755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gn/firefox-69.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3"; + sha512 = "ec4afbcb087157ee7c0b487ba72fbc3469e53522cee6a3e53d0dd88bb063d2ba6811da51dcefc696924ad79bb352440d2c5d91fecd87a72436508ad37ba9e86b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gu-IN/firefox-69.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c"; + sha512 = "a736f01bad98b99efb41d7d516f156ff6806b5e1489cbaf799c651efe641b5191742c1372459081abfc8e75c63d0832ab33037e3ef7a5fd07d943a02af60aa4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/he/firefox-69.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01"; + sha512 = "73a56b235d0c5a7c69e51a52ded8477b606c2a3eca9686f1f07a2407de1c3e00ea06364912b8f8f90734a33d7d6f68b64b7693876b1b47426713bc49355cbf86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hi-IN/firefox-69.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db"; + sha512 = "1d531f68e03763d49c03308d2cd04a84ad36afb3d19f7abed8528c39e7ac089912e569e20d3f6e177db5b17344d7c5389b7f0b2c9cdea5cc1be03983b2016c4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hr/firefox-69.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0"; + sha512 = "cef89e675a547a753db64861e4d6c65ca6faf87e573099907aabbc6f7fa1a4b9f8e3fcb0de44956fc95ae95a9bab98432879c3273c800ed4cc5e363cbbfe5e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hsb/firefox-69.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c"; + sha512 = "f038d4752c3eee035cb95a657ce4588c20ac32438d578ecc86520f3a0da6f89135a55b3afccb7aca833a9845742ef7cfed7638a4954697b3826fc97582190de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hu/firefox-69.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064"; + sha512 = "e66afc6d0108a36081f18d18c59f87b529ecad7d97b14916f2bcf38f19edfd61d6bae7c0c7fcee211484abe9ab003f432b7c56be32889c129fcace827e592c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hy-AM/firefox-69.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086"; + sha512 = "6ed9a940ed6c5c699b0647ff340f3b81a68cd99c3c8e6acaa7f0b7c2f35a9eb41402951834769426cafecfc44f5e3b66d21f046ac470b43d2507165d01c7ec3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ia/firefox-69.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678"; + sha512 = "f617f7077ed05f72c1eae5677691e5a62e6728d1c9d4fc92684306c072d96b6459eb014e23738e589d132f1e798ef36356fc40ce1f55972f43205a332a0e173e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/id/firefox-69.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a"; + sha512 = "8d08c251b0890b378fe46c2527a089ad80b33e550ad3e91e2461d6de11e3f7c00959350cf9b61baefbfb8f663064ccc6ffb489ec65ae7f05cae8995b388fa6c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/is/firefox-69.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83"; + sha512 = "ac4500d36d78330f569287a48197c927ebb8b73ad295d035137f682a7e51dbd58e6b7da7fe76997f538de71c0175627128e8860ec690c7e34d9e05027ad6b2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/it/firefox-69.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead"; + sha512 = "7e848f6827d8d169d6f00bd9f74bd041a6f81cc9eb5c77658ba6ad66d2640bb3fc615a7b5aad867dfb55496f464ebca41c38fb59aa410bc6b7c7b76867531dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ja/firefox-69.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4"; + sha512 = "45e31ec74e866bffe4fae630b8d2d183ba2caea16b53f3447e0ffbe6b24a1db35faf834c6dbba6d248713812d4023302bef4a815b050240a5995f1fb435cc0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ka/firefox-69.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a"; + sha512 = "10264908a24ffd4362e3ad0c766a60fa1eadf69c68e387482273427aacd19b2a2729cef28a2e32c99a924c31d88fb4b1642c570d7fe171f9475bf3ef9b9353b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kab/firefox-69.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d"; + sha512 = "7ff9328a0d475d1134c511555e9f0e163506b86008b8bfd649b98edca4d62321f10990c3d71910d97d5cdd0f355f2ffd47907d120fe15b54a2f8ae153c489147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kk/firefox-69.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37"; + sha512 = "67d5394f0f2eb4621c830ba679e2957448862b616c625f47be89b951d387015049bf5fe100173480c6f12b9b60a7688388b9118422777ac1b082fbc510a874b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/km/firefox-69.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab"; + sha512 = "71b7d9cf1f161d2f3264c36872071751d19e15d71ab8b7fd4b34c4a3dccb24641de20ea202ab7f6bd34641f2e209c58b1b26425df4e24961e8b545ca274fa505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kn/firefox-69.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81"; + sha512 = "e8babd31e5ba80af0c4bb397ad6cd995c7f7c3e5b9c07a14ee1b8fe707b7d1a92154cbb3ae9a4e0c4266e2fbd3497ee70ca854a417799a508e4453e28a06284b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ko/firefox-69.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3"; + sha512 = "30db8bf846c844e3e246fab62aa35ce71a2762d2e364bc7d54e967ce970188dcef23dbb70f1e9d030b18e1fa3f20bd698fc9e1965d3acb46411430617304cb0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lij/firefox-69.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892"; + sha512 = "f76d3b05b31173cbff091a731513ff213ea0f6868352983b02d9495203d454478a3f78633e2a8452eee331157c759daae28295d77657faa9bee2a7053525cb7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lt/firefox-69.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92"; + sha512 = "b941a48ae9dceb7689c82a670711cf37af0229d8472f6006887cb2adc519262ead9471b23ad1503a9d1be5096769a58894821ccc7ba72de0fa820df9df1d2449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lv/firefox-69.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a"; + sha512 = "89da4afe8892513ec831bc8f565409513d65dc314ac1cdb6e267940de6e572e93b10859b3ea05558a1aa7732b94fedc37dec18a069d3498077dcd20a04fdecb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mk/firefox-69.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b"; + sha512 = "3d42d641ee18b664af649e16458984c13b61c7c208ece86035aba3f5f1165eaf074e17ea7030ac43c3603e55dfa8a739c6f4b7f482ef469577c420f732ee883a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mr/firefox-69.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8"; + sha512 = "fb71aae70bfa56a876f4d2d033f533087bf4da146245d8ec3601f340ccfbcf4c37d2c5a0702191c0f0f6337405f40b069c0fcde90e1bc208a1631cad78c251b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ms/firefox-69.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754"; + sha512 = "d3cf1b0401cf0787240c39cd31f523d41272ceaced2c219a81173a2ab746d7b0003f919c43fbeae4aea187c0c048b8af71f9e338ca2f4e7049d65d767df950ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/my/firefox-69.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb"; + sha512 = "10b4272df10d520202299702aff5a0075a51df982225d9e8c826c8822367de6d8598cccec394c057d18ea5e9b965a6d2b6bf3c4f11a52b142d6998c2690212fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nb-NO/firefox-69.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02"; + sha512 = "e73d077e21bdd3305b85454a256fa07c481f377edcc4efb2b743d51ddd125bdc494d3741138e8b576ae1c155abc8ff7e059803df1566c49a269a522086e35e6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ne-NP/firefox-69.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302"; + sha512 = "63c0f1f8bad1dcf2dd1203383577923b9eb5e3dc87d4b1d7891fc93b145327eb538b7399994f6868e7c998acf58f2cf8ae69f57722bf68743900abe8c058f2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nl/firefox-69.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8"; + sha512 = "a2b3c2e791dd9d984b1772cc5db4c492aa530b389c03f234604c592749f7e0e689f10f563c4b9b2daab0ac71361bc77258c8278c0de7703820ede4b130dd69f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nn-NO/firefox-69.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944"; + sha512 = "8b348a4fac00a9490966032c425f469ead22af7eda989e49080ca548e875b24d050a2e0447ab75934a4440341edbf7d2ec8dd04dd227c1dcdc7099fa160e5a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/oc/firefox-69.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a"; + sha512 = "8a94a5a3753689c66cc103bcbc31c9c4e943414c27fae9c64390699eed8e00ce30c904a60b83e0c19ab2fe626d981a33f85bb473c3f54b19e1cc225eb122adc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pa-IN/firefox-69.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af"; + sha512 = "c1fa222416168e97452c0e50894d257f5e13b50728fd3cd53331043248b111961b9fc0f106f375295a79ea48af31f082a2463aa25eddb5f668258dde1c299480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pl/firefox-69.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a"; + sha512 = "01ca1ee21d42f093e3d0393443a91e7c5cb92e6cd9f90889e1d68f0690514fb0bef6cc295299856a5f13a58cae396e80c970cdc55e90853593e4fba285c066d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-BR/firefox-69.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964"; + sha512 = "341a9c074476fe17b917047a362775438dc5cce42a989d10695c248db5f1467f9a5dd41cd2ecc9b83132920bd85ba424bbeb5141597a95ab8098b6e6e3b0db05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-PT/firefox-69.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15"; + sha512 = "4ff64a3091999d5171193be0022fc239fc61c0fbf4487754be4ef9b3f7f8f16055ce302617c68f66c8c0a0fcee5b8cdc5f91e5bbd0ffd9500809d1566436f2d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/rm/firefox-69.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c"; + sha512 = "b7d109e8bcf9eec1757c14ae1bf693ac7616296a112961cac39b5466609af5050cfc2dcb4b68801dca7a4a2b00f76c4b4f31bc325163aac88a012f0a318898b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ro/firefox-69.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7"; + sha512 = "e8eae3c374b4ea0940e256946a21ed7f317bd9e37115a0b471ff656f194eaef8bf8205a8385b1d5e22f3aefab1be67cfea314b77483c6d9facfe58d757932804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ru/firefox-69.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b"; + sha512 = "567db4e146fde58297868a7ae7bbe55f658e49578951513d6e0728b82349ebb7b631bff8abe9ea2305ca0ff3f12d6c4b1507cb6df10b45f7763b3a505caf9ac1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/si/firefox-69.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8"; + sha512 = "24db969220444eddd0251ec1f17ccb30ce73050f1efcffb5dff3475c69bbba46735236c41f1bf2910a4c283b1ffe8f0195894f57350031c7519c8080e6ab0958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sk/firefox-69.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51"; + sha512 = "921d440d44adc69fde5a68e177b1d2cc7ba224e67f4688a4643887516ceaf713913bbab6e9b04a1ff01bf89f83a3b77709edcd603951f1a6d9b7b327a8c91152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sl/firefox-69.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23"; + sha512 = "9b56d90ff8b53615a0356fc593c236ee577b8fc2ed751345da4961ddeb10c039bd54285aaf72c193bb6deb27e4aa88960d61b68dda892acd4995c70c44e7c7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/son/firefox-69.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d"; + sha512 = "3bf49dd6a56efd4e855170de6964181fa3cb6e43eee637bb8458d841f863043ce845d17683b1fb2ca6b906dcbd2c9f4acda733c7fcb48a6718fff2f11b38590e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sq/firefox-69.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0"; + sha512 = "da7d3a5c5615a187d4bd8f8eda41c42060038ee545a578b31d9f0f2cb2f77c4f36f1ef3911230c09dc2d995444aa2867190c2b95ff399caecefa2f29f5cc9be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sr/firefox-69.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099"; + sha512 = "753a31f6c534d7faeb775bac52087ca59321fb18d6c3c456e7d84ed67f81fdb12d666e5e481886aacf5e59b22249fb10ad75d2e149cc1f8307e6362058d00aa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sv-SE/firefox-69.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1"; + sha512 = "84ba83794b6d6be38f4268ed0c2d8e0dee4a543de1244f7ab88ea6944f1485d0f6383d029a24c5ec08a3d2e78174e6292ac5c641abdad5f452a95786636a7aec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ta/firefox-69.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0"; + sha512 = "b9d10d22b3ddaeb9ca5536399494b8a51029dc37e04cbf352850122e988f8e04fe77e834f8cb0fb80ac1cad842ab1617207c8c643dceaedca07e23da44f38020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/te/firefox-69.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842"; + sha512 = "76a2367fd1913a5ffcbc4072701448880ee5319e46b82bb99bc12b84649cbe09464447504f4a8ffe40695c1ae76a2e0bc6f46d797811592c2409e2acb95783c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/th/firefox-69.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e"; + sha512 = "41a16d4d1ebb7e12cf43c748aa6eb44069cdfd6bb10482518d23f5e4886b10b01c103a0c1b53210fdb86bcc369ad4e2451fab6b4a4d3810b8dd7b3e8059a9de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/tr/firefox-69.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a"; + sha512 = "e0602d3b4ccaaed09fdc740b8d445cf4d9d4661bf8680c3ab8cbce002add211e2f64a127dfd010624ccb13fe81270ff8e1679ec6cc0b96b25c81b4fcd1a9314e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uk/firefox-69.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d"; + sha512 = "bdda18234e4d38484746a06b254fef51139ef0022474b2bc3a21c8ddc0fef62d13ca6c7829d24605ad04aada6a6ed4e9e4e029014d6e6a4cc56b4256da443163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ur/firefox-69.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6"; + sha512 = "7018f8f9c34e430acd461610e488968df3f0b0dd6ad53701582644413cf7e3efe0e83e04abeb6b931ce8755769baecb9cc25a2a94a4934f491079df968b824c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uz/firefox-69.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd"; + sha512 = "dcb88a105c8ed02534b4f54dc9265330035c0ebc3a34326c8a73acc96455a63956c665f4240589b10682e06acd0b4302c144045c77cd98484a35b273168f4a04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/vi/firefox-69.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f"; + sha512 = "43d695edaaa3c98e3607267115f1fec358c6b93bf79b2dbb5433ff98abadd6af54bc40f1fbe7e6fd7ee5a11558dc3266749b2cfaac47f8db818e554722052949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/xh/firefox-69.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466"; + sha512 = "ed78cda83cc9207a84a013c01535a423b8c315464b0339fa684fc0c3c64b4d014d097816b115a6d80c79c725f3b376bf996d980284b75a774418f9999dcf6e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-CN/firefox-69.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7"; + sha512 = "079dec7bf78a3f1e8b3dc392cb30916f70fde6e1092a5fd4ac26719448a5ce8c3f3b86296b585c8d9c4941e5a106976967348021aefc37fc8b18e352091e0664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-TW/firefox-69.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce"; + sha512 = "24a30c8a29ae61a3a3b96c68cc56086985be110da3cfc10210c3365fb6ead7dad9450888c15151fa782f0f47326fa3611478dc4ac265dad63bcaf3e1a654d20b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ach/firefox-69.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187"; + sha512 = "9523e53ce15887c713ed5664cafc89c41a9edb0430374cb7e15321e51f5f5f626e27f626f4a2475113f2c4dae9d3fefe18d498fb47166da59e7c4fbce7ae5bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/af/firefox-69.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077"; + sha512 = "2eb5ec7b08ab03d99e40b1147878211be92592213e568fe1770b8a1e570c012a43e60ebbf708012b138a615587dc28e12d9512b732b3434c6144c21ef30cae29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/an/firefox-69.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa"; + sha512 = "5eb5a56a0171f4ca0430d453c797d0a5de608ef947d1be3a471df85572658c631be78c70d90542ceb488f6f23986439acf101ac35949b55994fba1d4b7f353d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ar/firefox-69.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a"; + sha512 = "9cbf0bb2f75426361a015bae999e86c4cf033136f86f942def26f05ee91bdda8552f93f3fccdedfc01f2ce3366adbe7a89a5a49dc99394f57d95dae658df18e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ast/firefox-69.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f"; + sha512 = "c7dbf2fa1e9dc77a57259678a09242dd17d5246afecb395406e0f11f4b3d00f899e331c8e8ffec8f1b8487c710ae8adbde5b57366c029d8d2aa53a73c07df38a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/az/firefox-69.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4"; + sha512 = "de4deb88d31748410c77994091faee898d08ec211f2c55a92c7b2fc447758175311c6324f35e1753f483351a76616944392a5e9201fe03fbf50ed6e8f11ece5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/be/firefox-69.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3"; + sha512 = "64a94634bddda83e516586b89feb329f93dd26b98da690f46367c31f42b2b7cc6a9ccc3f339c4cfcfc507b8380b57bc81244db41cd07407acdc82ff455f84241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bg/firefox-69.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea"; + sha512 = "b1740cd77fe9871e580557c2d81ee6f8d944cd823f5949fc25685e7a7c886e960a70cf7f86d6404f4b33d5c1da4622ed452d217f7c8fd1cfcc2062531948f0a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bn/firefox-69.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a"; + sha512 = "5a61525960b05d788b03f58445e78050680c7101b70c017d07f9144f911697f2cb113f0a99a6898ee738bb927bfbfdec73714b3e7820a3f5d10484f9526dce97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/br/firefox-69.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e"; + sha512 = "9791d88c4c3a3ccef9fc59e4ffe74ef4b16ff25866643cf1ad43cc727d3880568d1d76c1f5ef4598c3fafb83f9e1c53ca43fa614af572525351a46ba646c5c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bs/firefox-69.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925"; + sha512 = "a75b91887962a52b9a24a7bd7d268baf54c5d65e03f444563f2d12af36f01fcf9ef3af17b642eb1a2dcb365ab58cc0c6e25bbbe94aee2c3c9ce487f57a0f5031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ca/firefox-69.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b"; + sha512 = "d5489feb1053c4f14481b8cbb3c55c9e6e99b970924caaf7ddda32d3274efdd24d4486ca46909bc469b3791ab7331b25a0eab476ac158d807948ea79aa8c4857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cak/firefox-69.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b"; + sha512 = "ecfedf3b03bb6d52fd43e077d4caa1c09c4a3c43af99e0f5a4089840d507484d753e7a8f0a43bb35b73250d21ffe27f38126ca22b26a06eea494bf89627cc906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cs/firefox-69.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594"; + sha512 = "5ce4b41bbd50e3ef18364e32632eb39bb25750910d1f5792797cf6e20a11c7bcb65ccdb7b23d780af80552363e7502ea22076bf7b1e7664d7b46b5403e32ab2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cy/firefox-69.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15"; + sha512 = "35ec97df8aec5981ca3edff177a83a8fa52816674d77a7f784cb9939ef65c797d196c7b6512d16307b9a3db8afbecfd958d4b296b72d93d36c01e372ab358175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/da/firefox-69.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534"; + sha512 = "ebae89079a202b95601d511d0052989bdf41f5dc7dd76037536982c12ff39f08ba4a9081d41fb0b9571ac5fda7fbe228154c4c437b66075bb1f27aaadc0adac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/de/firefox-69.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb"; + sha512 = "13bad87f6a65faf5f6ae95e613b199102fbd02204670952cde280dba7ecbc25a201c1a4c424f1ef1bec85a9af51b523bd82cdab612e0933c68b3e257c84a980a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/dsb/firefox-69.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de"; + sha512 = "32f92a1d47e83f5f3b73b4284adabff6282e65a5df7a2f3e4c76e5e0adb7332ce071ce0b250346870b79df8ea6118b51bfde7604d054dab86f230ae261eea8e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/el/firefox-69.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a"; + sha512 = "b524c8dd476df29526d030adace43660085b5ffff42f3508caf22a887e4664367606b57d6cf47911e0b61154df10c789b189ac897be80d994271a4464ad3de90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-CA/firefox-69.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902"; + sha512 = "005808f2650cb486b718b2fe0e6fd28cfee8b7bc5cab336421cc6cab70a56b0362214853f51410a25680b2cf4d8f528a274ac79f19f6235caf073ade4b1f9882"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-GB/firefox-69.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c"; + sha512 = "f9162f83614e6f9ae9a471b92597ce10090577a0e76b10dad397b1222f0012c44dd8f2e3bb8b28f2475b0371ddde37874a24edd75740d0d0a812dd4b5760fc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-US/firefox-69.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b"; + sha512 = "a7faa84a119abec0905718380bfc8d5853647d75b2d36e8bd7221b10868778eddccea5652f990a8626dc14da6b3402ca7adf5b7fa9789b13d6d460ee552d53d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eo/firefox-69.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8"; + sha512 = "90f02c45bbe91a3fa830967b32776619a21066af4a4df8201ad60cb0bb8d092b814e0d44a40bfd047635740381c223b7f4d17814408983c2cc8f1577fea3c9cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-AR/firefox-69.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e"; + sha512 = "a1d40686834a78b02d9ddb4b99d26f8d9c44ad5a7d36ac47652a013a430dd392db6270498eaff2eb7248808a8a23cc57572d6f4fa18f963587cc95381f75e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-CL/firefox-69.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192"; + sha512 = "761a6b16ce97e28edcc630f4edcee5636a0b112385956ddedfe2e18400207a149ae3d0275faf9f992ae0461108646f258e7ab75e93b9cb6f0c4900f61277c5a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-ES/firefox-69.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706"; + sha512 = "656e00db3eda337d6dc3e0bb69af70eada522cdaefbbb48dd211fb23df12c44bd48ab02e082ee711de746f2dafa52ed918b6fd13602a04b40eb58369b1a6fe11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-MX/firefox-69.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d"; + sha512 = "604e8397f07e1dd8337ea66fbcfa8c208ccc183d482881e4f7c2a9839ce6f9f14a89e6b981cf5ec4ca75332273af63458b0f716ad34a64b6db140db87159b85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/et/firefox-69.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334"; + sha512 = "d5371374a98c8a9d678c8d4b4f3d3af7152f461bb111e4451594570546acb5d94756eed0c6135b0d72e0c7f455f50c5654ac34275a06c60238749ea28104ed92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eu/firefox-69.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe"; + sha512 = "a5783b579317a49ee50a74c93b557a3acfe02911bf14e1a1efde185160a4658622ba635662530a4fd9e5c7251061f8eafd3d2421fb4f8eba19da5e0fabbfc8e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fa/firefox-69.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39"; + sha512 = "70655dcc91e411d3c430e0def9d8b7730922ac4fab9b902fa08f791db6e7d3104fa46aec2b95b91b8e56654778400b3760c4399135ad008aa029daecadad57f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ff/firefox-69.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83"; + sha512 = "d2ff78a9f318a9d0c74aff45d5559c605048bd3655ae4c0cae3018ff9c2f7c030ad5740c4010f1ba59c51633c35b2649f21d84a827900ef3fe277888042acd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fi/firefox-69.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1"; + sha512 = "9e8ca84d3e9642ee8950aa676182607d1c19b379389605f4b9311266e15c12d3dc6cac6baadad2f71d09e8acbe1a86ef029002fc46e39ce993370abeefca5eb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fr/firefox-69.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c"; + sha512 = "0d3810f2c00119277f1d7db396db85e8f82eaeec1db5d0bd7b10e106852140ddf704a02d4a93bd522c7a5b7f6f5e5b0457265cfde0f965e3442f42f55c6dd1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fy-NL/firefox-69.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5"; + sha512 = "2fa52fb095b4c118404378cd1435058634c5dcd77b8cc76d9f9fdf7596006ace8bdbfcef3fb7355022e241c4e35029b0fc44b1284293bcf473a7fef0df36b0d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ga-IE/firefox-69.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a"; + sha512 = "d2204a87685ab5bfb03bb553c18793de4774c563b40bfd13f8c7d50c088a6944e646d01fbacc0c16189da3f214a185bf82aa042de56d1d63ed020483744612d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gd/firefox-69.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee"; + sha512 = "a0b6139fae5b0629f5263fae3175fb7a45218c82b1517f97d52d4e65e5381dc0a15e05c1bd1896352681520ba7f213df24ce4878c9b9d4254e17a5a903d6e9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gl/firefox-69.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216"; + sha512 = "6e8a7f461b5d5c20ce60c7308a44c19e76bddc8637be3b5b1d2083434c3e213d9f21f6596573503d4cf5fa105cf7a103c038892f052f5fb29b1d6c64d11b4bb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gn/firefox-69.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647"; + sha512 = "5288b63758ea97c3349a5e8a427479f2ecdc7f855790fd05ba1de662e1997352dff84103076a923caa67872e849b1af5c2c80168f52d258d1e3f0aea1937a0a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gu-IN/firefox-69.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981"; + sha512 = "4e354642853c537ca7dec9bbe184a64f575870d8017c295db053364635c54ac8cc8e64a9686625b567d99d9055149a9d053a44ae0d145f91b01610570080556f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/he/firefox-69.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00"; + sha512 = "e627e7d824cc8174430c8450e1224a61a50cbf7a2fe7ebc1cbd13449c155d2334e40201b5e4190fdf848d7e53edd177bc70caf3addb220dc03fe1c1bf0fdcd6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hi-IN/firefox-69.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c"; + sha512 = "100c109d4668f1c5bd559bd539ee39a556eb03ac29cab0824a8d9f9121a210632d4fd6aa6e15f523df3bdaba637b5e13940e7afe25d1cccf85ad91eee693c89c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hr/firefox-69.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d"; + sha512 = "959573f7900c124dad817dcf526afbfe2a108305e96a94d20a763e19fd6c151b5544ab41191b731ed3881be38f78a29a747c9aba087b82ef29bf8f37eb3d57e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hsb/firefox-69.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1"; + sha512 = "4832103eb5ac251f664fc68b044b1bad78260e90be1ae9d3c149cd4d36b98ab1dae3cd56f135e4a7f46bad65af4a368d77717c332476d0faa453655ad0ccc2c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hu/firefox-69.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686"; + sha512 = "2f48f16eca53488b2d6a633913214d17f9be56ed84b86e2dd7d2134eb0950d3211e674ec836fee725d08d08042800fa72fd808dd1806b467a2559dd7113aa957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hy-AM/firefox-69.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439"; + sha512 = "315c10ad3c3787e7d564ed563d03b86204e825c9e4a5651a47568a543feb7bbcd0a5243ee8878e7c60df410a578e2fa69552d43ab2aa819e43124b1ebcd66b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ia/firefox-69.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b"; + sha512 = "376a0f09596165fc8c1f5c3624cab6b3ed0f512826504ec94e874b0f856ea3282673b99a6e84c0bf0a08ef76d9d11544c25cf501f3f2ca88cf3f6c00ca19874a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/id/firefox-69.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335"; + sha512 = "7f2acc92f59bb0568b6ea96d5820441790b95377f56da5158bf41a311262ff90bee1259f3917454b11f61fc6e4b329ad938d1116e8940fb28c529c31898a483f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/is/firefox-69.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089"; + sha512 = "4d714ca45d2d7bce2e2798c3fcfe7c876b024441a55c53e82c81cca572ebbbe172127ea005516c5729b49d4517fecef497946a45e2768e88f5b648cacbfc14a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/it/firefox-69.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407"; + sha512 = "57fb82bedb27d1928f5bbcbf5f0424966d1b7969df07fd6816d72976fa7a7ead07d2dbc644079672b5831fa1339104d5a9dc58f662b38dcc719e54cc5ce8e1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ja/firefox-69.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f"; + sha512 = "9b4bc5aa16bb05132de7b894cc118dd07166a5f8af603aa206f8e52aa8029532f4fea7236791ed1f0d8d43214240ffee6297969b030750379631bb55ea105609"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ka/firefox-69.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281"; + sha512 = "d0b789fbb3fe72bc8e0f4eba595d8015ef6c66fdfd6e8d699ef15071b1e83ed4d5245f7513a6b7122f0852378241fc2ab01047f4d968dbcf40dde79a7524fa30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kab/firefox-69.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19"; + sha512 = "1aba37ef9fe09a5765ba3b4dae2165373b6fc0b1a10f6705835cf70af0797ef024256d42b7f67ee9b8eb2d93010bac165732d483928253d289d39260799cd450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kk/firefox-69.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9"; + sha512 = "34be7310030481903c867e3d0ef69cf87dea784804190db89109703568515a933704d81d3aaae2e900be6b96a99a48c5d72ce860ece0418fee344b73d774fdea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/km/firefox-69.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd"; + sha512 = "62209e5ec47160647d160a8c74ac63ccba4340704e6408cfe780ba6215a1228f994a6b3af5d7d44438effa778377fe31993e255bb6ec4e8eb622eda0f6e6eafe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kn/firefox-69.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33"; + sha512 = "ac1fc4c0c3b8b6cead2eef3dffd208eee7cd215aad444f23e00acbf390b933486cfff9b26a34356c57b85963d546d2ebb01dd8e22615ce58df0e1aec83d7cdb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ko/firefox-69.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe"; + sha512 = "a27d76e6acd03b1dafa9b3931a8906d456d35216947b37148eaf48736be18953d83e3fec01914812a8180017ece34662a877c2aeb218404ed3f1f75287b5427b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lij/firefox-69.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac"; + sha512 = "c0dfb7d36b87250edf7eb2bb566bb46d9ba782d257e87f6e3d080972d2f1cca37b6c41201fea7fdac86db471eadd86c2e2d8a4f568c8d89e848653060e01dda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lt/firefox-69.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c"; + sha512 = "9d0990670c808f2e0ea2d4033e4a33347653979d9eb228ba7811069c5e2559e66c50eb8b7c5e8e4ffbd7916f049813b52c3035907d15b8df9dfd266a31a92883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lv/firefox-69.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8"; + sha512 = "0369ff96b5b31795df415f9cb7009208a6e061acd384e0eae689b6cd40e74c737c3137c6de001f4149cdde7f6e6e3ee24eee5d69ffc83426285cd109a29b5441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mk/firefox-69.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b"; + sha512 = "89f9401be25014c9b209fde3f2696462cfcb8b700163190c7c81548dc610c53d930cde00b8d3e25506a2e50d55cca401f856c5a80e2d2a1a1c25f4ab3c167e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mr/firefox-69.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877"; + sha512 = "5fe5f6a7f498d0c287bebb9962843c8d94f1f07245f55c8c904e768ede8fa41ee8b63628d63f03f73c9b46f08c1a10344a5267737cd5d89b7667cce7359cf01f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ms/firefox-69.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c"; + sha512 = "8e38689f618fb80958b8aa91ce83114f52542c4ad42483f694df1b3825a1dc3de2cc34d61cac5fc55b2b35f9dead7f31e7ddd631f9336c5cf711f02ebbe9a2ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/my/firefox-69.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d"; + sha512 = "5a8c6ac58cfb35b12cacfcbcf933a7aeb5ed8a425e15f9953746e593c6b15b517305d7e721c89d8fd66967f4fb3de0a50f1b6fa7dc4010a120f9d93745aa4e7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nb-NO/firefox-69.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8"; + sha512 = "80cc7131d33cdbf49a346ced7f8a771e2df9078cfca926e1eca14e15464dc84d574efe9212031f986f8af7b339f0a16a31c0f492ea19b4f728763124b21b30a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ne-NP/firefox-69.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3"; + sha512 = "42cc3265931455e4be0c4c0a25e108d8af14d786feb232d2b5c66695a9f182fb7d93f604390620c211aae38ab7e9d76d6e498867d886badf19a4034ab08503b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nl/firefox-69.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38"; + sha512 = "1062c28e1a5d8ea5aecbe1af1b4b70e0cafa362c5cae1a5f7000220acb2f658cd3c5ccef8ea5bb35d6b14ddb211b34bd3a0169baa9d02a37ddfc1feb90f61326"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nn-NO/firefox-69.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922"; + sha512 = "9c0b4f0ed5cf8ed2d8fcd71c6d72f09a736a339dd83318ea5368652a154e05a695254fd4e78a3e8a185e0c10362e649883e772ff7e64249c6c470d39cb690f50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/oc/firefox-69.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69"; + sha512 = "407ff179331cf0dc5ae6061f3f5e1f13ae7df5dd5d23b664bcaeebc95e35e6c3b5307a5575264cb0037cbb4561d37dc68dc69a5660729a18593f9e3ed25770e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pa-IN/firefox-69.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3"; + sha512 = "c1efcb59556591fa2de0568fffd0b6e29835144ca6cda471153c2336b4500cac0d367de84ef345cdd6d995297ec854df97380592477f42cc3f197b1cca443fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pl/firefox-69.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17"; + sha512 = "881e8e438564eb7de648a2bb9c199e184edee3c97382cebb989734e0d6aeb5c213590d6ea04ea6dbbe31c085e62be18172e4dede07d8d8f067de0b2e52d709a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-BR/firefox-69.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf"; + sha512 = "b45f8802d0a9a1967b17f09bc99bc6761befb676e901fd0b0dc891f0d222c8d860337c70931a082a8508c68cc8b259d460e0534bf9e276c70f69a092f70f49a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-PT/firefox-69.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382"; + sha512 = "2b04403601a5c43fd1e5f4f69f3cc5a3761b1d017c97f3b9997317bbc4cb0960aeaac4df1145a8e64b64aa2397d0042fdcf49b0f01d8403b5d63fd26812c85a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/rm/firefox-69.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38"; + sha512 = "37f0c828559cb9afc157765ea87b3045f827eff59c2a1fea62fc75c3b28886191578bd81d2f44c9acd6d9da0e63e67cc155724759e424f7f2d91ec3256a7f899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ro/firefox-69.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6"; + sha512 = "23a8b2753dabbaf2e020c0cab2359dbfd99e260d17346de48275941b43134d1b6fe844498e4fda10e5323adfd459757d2a1da3c82b441ac099455b8e33f2cad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ru/firefox-69.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1"; + sha512 = "b8999174e73e0002c06077575ed9a2b8b1dbbcac162a8d53eccde1a3ec50ef5bb26a123e89a5f38029c379560c0b6c67e8da355aeb42d151504fdf3cbac5bfab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/si/firefox-69.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e"; + sha512 = "8dcc78847797a853f78eaa100f5cba6da54f52e28e3bb92f64ec1187421c871a4f6fbbfa51971b90d7476703862fdaef241110648e031038cd4a3aa62d9eb74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sk/firefox-69.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431"; + sha512 = "416bbffcfd8a32f1c3c22f28beaf3fa45df693e373552ecc78c921dfb010db79c8423251697daf7ea3038dad07ba168786168915a7c4ff844a62167e929da9cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sl/firefox-69.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d"; + sha512 = "b99af009ca4c1c7a190a31146de0ff2975196e89687fc37ec9b8c506a18bd9f4ccb1820751f52c50acb3c808998dea08151de3a38b69f62b45d7c80f97b0b42e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/son/firefox-69.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c"; + sha512 = "5efab88af1ade7d8c7437c638282c9f1fe8490174cfaa47563b0eaae7fe8c4b35210f240e4154458adf054924780c2a8d91b49158cc693cc3773f18963551434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sq/firefox-69.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516"; + sha512 = "4a6b10da6d0de76aae0e63a12c81369d8068689e23a3d289629b64350dc5fe191c42d91b58100206befe81a7bdf899c66bad78883605d020eb1e7559b9f9d237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sr/firefox-69.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94"; + sha512 = "3833a2db3d8c2a9ef616cb1679c07c71280b74330771d79579c414619e3517bfec56c90712529bffaaf99abb07a63547a8aff9fb376f1089b3964c8dd92e523d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sv-SE/firefox-69.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114"; + sha512 = "8dd898b57cff3dc25a52a7693f8e62f130af23a9c1e7d74a4c36abc5c6249f7b142006601596bd1cdc65b04c5b3ce2d8dcfce6caf230db047d1e7dba127f47d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ta/firefox-69.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f"; + sha512 = "7fa1f1e7dc3099a44841db01ee2746f87eaa4e93a12a5ba909e428b0dd5f3386a35eb66650fbd4b8e160d0a4c48f5b98c19a44a16b48432e576fe32ac953ebd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/te/firefox-69.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477"; + sha512 = "74a78995878c2c207fc02abf667ef744008fe544c5f594d69c5c4653cb2adc58d56973591b4c0264d77993d76a2802dee1ce9b10b8355848ab6c11d0cfa3cc47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/th/firefox-69.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6"; + sha512 = "2fdda53cdea8a2a153b192a52f76e4a5b73dd128310d53ad26c59fadd54734b8d2a2f88b11087e18d6179d0b7fb1a9e87f722c5241544860be25ea14542d7da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/tr/firefox-69.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3"; + sha512 = "8cb6a590382c080a0b6ed81a566b385f07e909a86faab077d2f0027a05d2e985e9ab4eee0103cb30f9e88fde7e63c20250f4b2165824426c7a3956e69a448219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uk/firefox-69.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c"; + sha512 = "a9269d73bfdbaa9f9c9484588a0921003c7602732a78c8c5316b00d67ef6ae43836a1fb606988fe3bc2143fb6be55a677a1238da0ad9d3a531bfc19ad0e7d482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ur/firefox-69.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52"; + sha512 = "38696e57487b19eccd4669ee7fc0159f13a91abe062e21657111f95d58cf3183fcba370af94156b350a87810f9d73492e8ad2bd8e48a6ed5e82a9a3e54373099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uz/firefox-69.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1"; + sha512 = "c912f028950f78c3b4b34c0f40d4381ccd961199f606d4ff8ce75c260dbc04b4eb471985edd61b7c380471835072ff7d58149bd98d029741ddcb39ea082c90e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/vi/firefox-69.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e"; + sha512 = "40b0dd2c70c647dfa3f73db24d17296e719f6dedbff24fe7465799b9ae1deeac61a394a11095a93f48b785e5645ca8f801312e965dadf7de4fb964c87b90b17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xh/firefox-69.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140"; + sha512 = "35993045afc78623d4ba1fb4e30c3c6e595f2ef02e5720f435d541af510ea552c254209f67afdad8d228bbf4c557885b5a9e2b6579973b323000a796d7e1a4a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-CN/firefox-69.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9"; + sha512 = "e1cbdd94cb9c608f4c85354a1c683058eced84e783e6a76c08906983aa8b879094978747898cefe995bca4855ff463599d6288863739305f6a0eac0b0d07cda2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-TW/firefox-69.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d"; + sha512 = "307e82f9c1b68e916c4369f57c52158be4279a8a5017bcd6e1d5c50e93ce8c25ebf07b115937ae0bf809a8e5448486d0f951b2c426a318037388de6ff58a2b02"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3e8cf4d66b9..1d89ee2a5d7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "69.0"; + ffversion = "69.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43"; + sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9"; }; patches = [ @@ -32,6 +32,7 @@ rec { homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco andir ]; platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { @@ -265,17 +266,17 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon { - ffversion = "60.8.0esr"; - tbversion = "8.5.4"; + tor-browser-8-5 = tbcommon rec { + ffversion = "60.9.0esr"; + tbversion = "8.5.6"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.8.0esr-8.5-1-slnos" - rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; - sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; + # branch "tor-browser-60.9.0esr-8.5-2-slnos" + rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc"; + sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix new file mode 100644 index 00000000000..6ab53376310 --- /dev/null +++ b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, gcc7, pkg-config +, next +, webkitgtk, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "next-gtk-webkit"; + inherit (next) src version; + + makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ]; + installTargets = "install-gtk-webkit"; + + nativeBuildInputs = [ gcc7 pkg-config ]; + buildInputs = [ + webkitgtk + gsettings-desktop-schemas + ]; + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (user interface only)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix new file mode 100644 index 00000000000..2b2e173342c --- /dev/null +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -0,0 +1,80 @@ +{ pkgs, stdenv, fetchFromGitHub +, gcc7, pkg-config, makeWrapper +, glib-networking +, next-gtk-webkit +, lispPackages +, sbcl +}: + +stdenv.mkDerivation rec { + pname = "next"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "atlas-engineer"; + repo = "next"; + rev = version; + sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj"; + }; + + # Stripping destroys the generated SBCL image + dontStrip = true; + + prePatch = '' + substituteInPlace source/ports/gtk-webkit.lisp \ + --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" + ''; + + nativeBuildInputs = [ sbcl makeWrapper ]; + buildInputs = with lispPackages; [ + trivial-features + trivial-garbage + alexandria + bordeaux-threads + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + closer-mop + dexador + ironclad + lparallel + parenscript + quri + cl-css + log4cl + mk-string-metrics + sqlite + str + swank + trivia + trivial-clipboard + unix-opts + dbus + ]; + propagatedBuildInputs = [ next-gtk-webkit ]; + + buildPhase = '' + common-lisp.sh --eval "(require :asdf)" \ + --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ + --eval '(asdf:make :next)' \ + --quit + ''; + + installPhase = '' + install -D -m0755 next $out/bin/next + ''; + + preFixup = '' + wrapProgram $out/bin/next \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (with Lisp development files)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; + } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6483b6d03e3..be08df3a704 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.7.1628.33-1"; + version = "2.8.1664.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34"; + sha256 = "1znhlwwgq4k0fplr4l8ixgn6g5k26ns77j2dm0pjg3a2jgjq6rdr"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/pkgs/applications/networking/cluster/cni/plugins-deps.nix new file mode 100644 index 00000000000..a6bbd333be4 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugins-deps.nix @@ -0,0 +1,210 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.11"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + { + goPackagePath = "github.com/Microsoft/hcsshim"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/hcsshim"; + rev = "v0.7.4"; + sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg"; + }; + } + { + goPackagePath = "github.com/alexflint/go-filemutex"; + fetch = { + type = "git"; + url = "https://github.com/alexflint/go-filemutex"; + rev = "72bdc8eae2ae"; + sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4"; + }; + } + { + goPackagePath = "github.com/buger/jsonparser"; + fetch = { + type = "git"; + url = "https://github.com/buger/jsonparser"; + rev = "f4dd9f5a6b44"; + sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5"; + }; + } + { + goPackagePath = "github.com/containernetworking/cni"; + fetch = { + type = "git"; + url = "https://github.com/containernetworking/cni"; + rev = "v0.7.0"; + sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; + }; + } + { + goPackagePath = "github.com/coreos/go-iptables"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-iptables"; + rev = "v0.4.1"; + sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "39ca1b05acc7"; + sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4"; + rev = "f0e4d29ff023"; + sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4client"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4client"; + rev = "bed07e1bc5b8"; + sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4server"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4server"; + rev = "477b11cea4dc"; + sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l"; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "885f9cc04c9c"; + sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8"; + }; + } + { + goPackagePath = "github.com/j-keck/arping"; + fetch = { + type = "git"; + url = "https://github.com/j-keck/arping"; + rev = "2cf9dc699c56"; + sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "22422dad46e1"; + sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-shellwords"; + rev = "v1.0.3"; + sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "7f8ab55aaf3b"; + sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "2152b45fa28a"; + sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "42ed695e3de8"; + sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.0.6"; + sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "023a6dafdcdf"; + sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128cc"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "7c1a557ab941"; + sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "49bb7cea24b1"; + sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "66b7b1311ac8"; + sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index b5276818f79..8956828fa76 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,6 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }: - -stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }: +buildGoPackage rec { pname = "cni-plugins"; version = "0.8.2"; @@ -11,28 +10,31 @@ stdenv.mkDerivation rec { sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; }; - buildInputs = [ removeReferencesTo go ]; - - buildPhase = '' - patchShebangs build_linux.sh - export "GOCACHE=$TMPDIR/go-cache" - ./build_linux.sh - ''; - - installPhase = '' - mkdir -p $out/bin - mv bin/* $out/bin - ''; - - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; - + goDeps = ./plugins-deps.nix; + goPackagePath = "github.com/containernetworking/plugins"; + subPackages = [ + "plugins/meta/bandwidth" + "plugins/meta/firewall" + "plugins/meta/flannel" + "plugins/meta/portmap" + "plugins/meta/sbr" + "plugins/meta/tuning" + "plugins/main/bridge" + "plugins/main/host-device" + "plugins/main/ipvlan" + "plugins/main/loopback" + "plugins/main/macvlan" + "plugins/main/ptp" + "plugins/main/vlan" + "plugins/ipam/dhcp" + "plugins/ipam/host-local" + "plugins/ipam/static" + ]; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; homepage = https://github.com/containernetworking/plugins; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 5c0adbdc548..73d82207daf 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,18 +2,17 @@ buildGoModule rec { pname = "k9s"; - version = "0.7.13"; + version = "0.8.4"; src = fetchFromGitHub { - owner = "derailed"; - repo = "k9s"; - rev = version; + owner = "derailed"; + repo = "k9s"; + rev = version; sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8"; }; modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8"; - meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; homepage = https://github.com/derailed/k9s; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index a69dc8890a7..aaf183ad666 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "kubeless"; version = "1.0.4"; @@ -10,7 +10,8 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; }; - modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd"; + + goPackagePath = "github.com/kubeless/kubeless"; subPackages = [ "cmd/kubeless" ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cbe32e57f20..1ad7ad3e393 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1"; + sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9c07760355c..ec452a312e4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.8"; - sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67"; + version = "0.12.9"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9a05a92cfb3..01707f12da2 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "73.4.118"; + version = "81.4.195"; arch = { x86_64-linux = "x86_64"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix new file mode 100644 index 00000000000..10973345dec --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pidgin, pkgconfig }: + +stdenv.mkDerivation { + pname = "purple-slack-unstable"; + version = "2019-08-18"; + + src = fetchFromGitHub { + owner = "dylex"; + repo = "slack-libpurple"; + rev = "be97802c7fd0b611722d2f551756e2a2672f6084"; + sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/dylex/slack-libpurple; + description = "Slack plugin for Pidgin"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} + diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 2e9602458e7..b9017c12d60 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.3", + "version": "1.3.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 2c4557f2cc0..1fde990e4a8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.3.3"; + version = "1.3.5"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; + sha256 = "05xwp6062lvjsy539swa6dxj3k3dw1667nkx8ffwdl1dg17wphy8"; }; in yarn2nix-moretea.mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2755d181da2..b938f4f47cf 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; + sha256 = "0vpfv5rvrhrws52j4lxnj1qyagf9894znpxkdnkp72g19qsjn66g"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index a3f32bc8295..780dab79e99 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchpatch, python36Packages }: +{ stdenv, fetchpatch, python3Packages }: with stdenv.lib; - -# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4 -with python36Packages; +with python3Packages; buildPythonPackage rec { pname = "turses"; @@ -14,8 +12,6 @@ buildPythonPackage rec { sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; }; - disabled = ! python36Packages.pythonOlder "3.7"; - checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; @@ -24,6 +20,11 @@ buildPythonPackage rec { url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3"; }) + # python 3.7+ support + (fetchpatch { + url = "https://github.com/booxter/turses/commit/e6e285eae50fc3d2042a476185fe60daef1e758e.patch"; + sha256 = "0g2zsrny955viwgs2l6gpiiz8m67b5sgdcxkjmfimfvvih5sg79f"; + }) ]; checkPhase = '' diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index bd38855109a..6fd66096b5b 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras , pkgconfig, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kvirc"; version = "5.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pkgconfig cmake gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced IRC Client"; homepage = "http://www.kvirc.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6aacdde544b..6addd66ac63 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,5 +1,5 @@ { monolithic ? true # build monolithic Quassel -, daemon ? false # build Quassel daemon +, enableDaemon ? false # build Quassel daemon , client ? false # build Quassel client , tag ? "-kf5" # tag added to the package name , static ? false # link statically @@ -21,11 +21,11 @@ let buildClient = monolithic || client; - buildCore = monolithic || daemon; + buildCore = monolithic || enableDaemon; in -assert monolithic -> !client && !daemon; -assert client || daemon -> !monolithic; +assert monolithic -> !client && !enableDaemon; +assert client || enableDaemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only let @@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec { ] ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" - ++ edf daemon "WANT_CORE" + ++ edf enableDaemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; preFixup = - lib.optionalString daemon '' + lib.optionalString enableDaemon '' wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index bfacac2eaf4..65490ada653 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -1,21 +1,23 @@ -{ lib, python3Packages, fetchFromGitHub +{ stdenv, lib, python3Packages, fetchFromGitHub , withGui ? false, wrapQtAppsHook ? null }: python3Packages.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.2.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf"; + sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws"; }; disabled = python3Packages.pythonOlder "3.6"; propagatedBuildInputs = (with python3Packages; [ - blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog + blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog + ] ++ lib.optionals stdenv.isLinux [ + sdnotify systemd ] ++ lib.optional withGui pyqt5); nativeBuildInputs = lib.optional withGui wrapQtAppsHook; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index cd512e77613..85b73141966 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with pythonPackages; [ - pythonPackages.notmuch chardet dkimpy + pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; makeWrapperArgs = [ diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 78b1aad03fb..7d7972c3e58 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab"; + sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index c694398bd7d..3af4c7f5e15 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"; + sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f9b17b42bde..d9a3d4aefcd 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { ''; dontStrip = true; + preferLocalBuild = true; meta = with lib; { homepage = http://www.teamviewer.com; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix new file mode 100644 index 00000000000..ceaddeb3d44 --- /dev/null +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, dmd +, pkgconfig +, curl +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "onedrive"; + version = "2.3.9"; + + src = fetchFromGitHub { + owner = "abraunegg"; + repo = "onedrive"; + rev = "v${version}"; + sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f"; + }; + + nativeBuildInputs = [ + dmd + pkgconfig + ]; + buildInputs = [ + curl + sqlite + ]; + meta = with stdenv.lib; { + description = "A complete tool to interact with OneDrive on Linux"; + homepage = "https://github.com/abraunegg/onedrive"; + license = licenses.gpl3; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa0870ea858..5e9945492de 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "rclone"; version = "1.49.3"; @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa"; }; - modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; + goPackagePath = "github.com/rclone/rclone"; subPackages = [ "." ]; - outputs = [ "out" "man" ]; + outputs = [ "bin" "out" "man" ]; postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index adad5c8680f..83515de4990 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, boost, qttools, qtwebkit, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, @@ -28,6 +28,17 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; + patches = [ + # Changes in Qt 5.13 mean that QDate isn't exported from certain places, + # which the build was relying on. This patch explicitly imports QDate where + # needed. + # Should be unnecessary with kexi >= 3.3 + (fetchpatch { + url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53"; + sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj"; + }) + ]; + meta = with lib; { description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index 92183306038..f45e695486d 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib -, perl, ncurses, hamlib, xmlrpc_c }: +, perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { pname = "tlf"; @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; - buildInputs = [ glib ncurses hamlib xmlrpc_c ]; + buildInputs = [ glib ncurses5 hamlib xmlrpc_c ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; postInstall = '' mkdir -p $out/lib - - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3d169f50104..f31dd0daa5c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs cairo curl openssl boost - swig python + swig (python.withPackages (ps: with ps; [ wxPython ])) ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index d357bef2c7a..c4041281054 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -34,8 +34,7 @@ stdenv.mkDerivation { mv bin $out/bin mv doc $out/share - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5 + ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 # Add a clang symlink for easy building with a suitable compiler. diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 05c0c0e8ec6..4022383dbc7 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.25"; + version = "0.7.26"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3"; + sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d"; }; buildInputs = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index b4d82b9583c..d0625201a37 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b"; + sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 8fd69f62171..0b67b3cff12 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -44,6 +44,7 @@ , gsl , ntl , jdk +, less }: # This generates a `sage-env` shell file that will be sourced by sage on startup. @@ -92,6 +93,7 @@ let rubiks flintqs jdk # only needed for `jmol` which may be replaced in the future + less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); in diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 3bfb70f5ce8..2c0bb84c801 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}: +{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: stdenv.mkDerivation { name = "fdr-4.2.3"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation { python27Packages.python qtbase qtx11extras - ncurses + ncurses5 xorg.libX11 xorg.libXft zlib @@ -26,8 +26,7 @@ stdenv.mkDerivation { rm -r lib/qt_plugins cp -r * "$out" - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e64254ed29f..a0f39bad363 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -147,6 +147,8 @@ let lab = callPackage ./lab { }; + lefthook = callPackage ./lefthook { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix new file mode 100644 index 00000000000..04ba4c7c48f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "lefthook"; + version = "0.6.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Arkweid"; + repo = "lefthook"; + sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d"; + }; + + modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2"; + + meta = with stdenv.lib; { + description = "Fast and powerful Git hooks manager for any type of projects"; + homepage = "https://github.com/Arkweid/lefthook"; + license = licenses.mit; + maintainers = with maintainers; [ rencire ]; + }; +} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 261ae3317f2..f2d87fd69dd 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.8.0"; @@ -11,21 +11,12 @@ buildGoModule rec { sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; }; - modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7"; - - patches = [ - (fetchpatch { - # Build fails on v2.8.0 with go 1.13 due to invalid dependency version: - # go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z) - # TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release. - url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch"; - sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj"; - }) - ]; + goPackagePath = "github.com/git-lfs/git-lfs"; subPackages = [ "." ]; preBuild = '' + cd go/src/${goPackagePath} go generate ./commands ''; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 4ddd84433e8..1b9f0d0997a 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $\buildInputs; do + for i in $buildInputs; do echo adding \$i/lib rpath=\$rpath\${rpath:+:}\$i/lib done diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 04ddbbb8c06..af917981e1c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + dontWrapQtApps = true; postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a50ee8b5664..4636ce48b1a 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation -, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: +{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt +, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools +}: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; +let + # https://github.com/mltframework/shotcut/issues/771 + fixVaapiRendering1 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch"; + sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp"; + }; + fixVaapiRendering2 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch"; + sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw"; + }; +in + mkDerivation rec { pname = "shotcut"; version = "19.09.14"; @@ -16,6 +29,8 @@ mkDerivation rec { sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; }; + patches = [ fixVaapiRendering1 fixVaapiRendering2 ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 45ec7383fc8..53ace1b5d8b 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.15.2"; + version = "0.18.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk"; - jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz"; + firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh"; + jailer-bin = fetchbin "jailer" "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd"; in stdenv.mkDerivation { name = "firecracker-${version}"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ac52b83e43d..633f047be5a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -92,6 +92,9 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch + # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14 + # https://www.virtualbox.org/ticket/18911 + ./kernel-5.3-fix.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch new file mode 100644 index 00000000000..ba9c7c941db --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch @@ -0,0 +1,72 @@ +--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -2123,7 +2123,9 @@ + #endif + if (in_dev != NULL) + { +- for_ifa(in_dev) { ++ struct in_ifaddr *ifa; ++ ++ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { + if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) + return NOTIFY_OK; + +@@ -2137,7 +2139,7 @@ + + pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, + /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); +- } endfor_ifa(in_dev); ++ } + } + + /* +--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c ++++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +@@ -283,12 +283,15 @@ + if (RTCpuSetCount(&OnlineSet) > 1) + { + /* Fire the function on all other CPUs without waiting for completion. */ +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++ Assert(!rc); NOREF(rc); + # else + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); +-# endif + Assert(!rc); NOREF(rc); ++# endif + } + #endif + +@@ -326,7 +329,6 @@ + { + #ifdef CONFIG_SMP + IPRT_LINUX_SAVE_EFL_AC(); +- int rc; + RTMPARGS Args; + + RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; +@@ -337,14 +339,17 @@ + Args.cHits = 0; + + RTThreadPreemptDisable(&PreemptState); +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # else /* older kernels */ +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # endif /* older kernels */ + RTThreadPreemptRestore(&PreemptState); + +- Assert(rc == 0); NOREF(rc); + IPRT_LINUX_RESTORE_EFL_AC(); + #else + RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 1787e40eb96..ecd792f74e7 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78"; + sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss"; + cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9e55d1172cb..7e2b2b347d9 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -185,6 +185,7 @@ rec { keyutils.lib libjack2 fribidi + p11_kit # libraries not on the upstream include list, but nevertheless expected # by at least one appimage diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix deleted file mode 100644 index 9af5cbe652c..00000000000 --- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix +++ /dev/null @@ -1,693 +0,0 @@ -# Generated by carnix 0.10.0: carnix generate-nix --src . -{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -rec { - crates = cratesIO // rec { -# cargo-vendor-0.1.23 - - crates.cargo_vendor."0.1.23" = deps: { features?(features_.cargo_vendor."0.1.23" deps {}) }: buildRustCrate { - crateName = "cargo-vendor"; - version = "0.1.23"; - description = "A Cargo subcommand to vendor all crates.io dependencies onto the local\nfilesystem.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - edition = "2018"; - src = exclude [ ".git" "target" ] ./.; - dependencies = mapFeatures features ([ - (cratesIO.crates."cargo"."${deps."cargo_vendor"."0.1.23"."cargo"}" deps) - (cratesIO.crates."docopt"."${deps."cargo_vendor"."0.1.23"."docopt"}" deps) - (cratesIO.crates."env_logger"."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps) - (cratesIO.crates."failure"."${deps."cargo_vendor"."0.1.23"."failure"}" deps) - (cratesIO.crates."serde"."${deps."cargo_vendor"."0.1.23"."serde"}" deps) - (cratesIO.crates."serde_json"."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps) - (cratesIO.crates."toml"."${deps."cargo_vendor"."0.1.23"."toml"}" deps) - ] - ++ (if features.cargo_vendor."0.1.23".openssl or false then [ (cratesIO.crates.openssl."${deps."cargo_vendor"."0.1.23".openssl}" deps) ] else [])); - features = mkFeatures (features."cargo_vendor"."0.1.23" or {}); - }; - features_.cargo_vendor."0.1.23" = deps: f: updateFeatures f (rec { - cargo."${deps.cargo_vendor."0.1.23".cargo}".default = true; - cargo_vendor."0.1.23".default = (f.cargo_vendor."0.1.23".default or true); - docopt."${deps.cargo_vendor."0.1.23".docopt}".default = true; - env_logger."${deps.cargo_vendor."0.1.23".env_logger}".default = true; - failure."${deps.cargo_vendor."0.1.23".failure}".default = true; - openssl = fold recursiveUpdate {} [ - { "${deps.cargo_vendor."0.1.23".openssl}"."vendored" = - (f.openssl."${deps.cargo_vendor."0.1.23".openssl}"."vendored" or false) || - (cargo_vendor."0.1.23"."vendored-openssl" or false) || - (f."cargo_vendor"."0.1.23"."vendored-openssl" or false); } - { "${deps.cargo_vendor."0.1.23".openssl}".default = true; } - ]; - serde = fold recursiveUpdate {} [ - { "${deps.cargo_vendor."0.1.23".serde}"."derive" = true; } - { "${deps.cargo_vendor."0.1.23".serde}".default = true; } - ]; - serde_json."${deps.cargo_vendor."0.1.23".serde_json}".default = true; - toml."${deps.cargo_vendor."0.1.23".toml}".default = true; - }) [ - (cratesIO.features_.cargo."${deps."cargo_vendor"."0.1.23"."cargo"}" deps) - (cratesIO.features_.docopt."${deps."cargo_vendor"."0.1.23"."docopt"}" deps) - (cratesIO.features_.env_logger."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps) - (cratesIO.features_.failure."${deps."cargo_vendor"."0.1.23"."failure"}" deps) - (cratesIO.features_.openssl."${deps."cargo_vendor"."0.1.23"."openssl"}" deps) - (cratesIO.features_.serde."${deps."cargo_vendor"."0.1.23"."serde"}" deps) - (cratesIO.features_.serde_json."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps) - (cratesIO.features_.toml."${deps."cargo_vendor"."0.1.23"."toml"}" deps) - ]; - - -# end - - }; - - cargo_vendor = crates.crates.cargo_vendor."0.1.23" deps; - __all = [ (cargo_vendor {}) ]; - deps.adler32."1.0.3" = {}; - deps.aho_corasick."0.7.3" = { - memchr = "2.2.0"; - }; - deps.ansi_term."0.11.0" = { - winapi = "0.3.7"; - }; - deps.atty."0.2.11" = { - termion = "1.5.1"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.autocfg."0.1.2" = {}; - deps.backtrace."0.3.15" = { - cfg_if = "0.1.7"; - rustc_demangle = "0.1.14"; - autocfg = "0.1.2"; - backtrace_sys = "0.1.28"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.backtrace_sys."0.1.28" = { - libc = "0.2.51"; - cc = "1.0.35"; - }; - deps.bitflags."1.0.4" = {}; - deps.bstr."0.1.2" = { - memchr = "2.2.0"; - }; - deps.build_const."0.2.1" = {}; - deps.byteorder."1.3.1" = {}; - deps.bytes."0.4.12" = { - byteorder = "1.3.1"; - iovec = "0.1.2"; - }; - deps.bytesize."1.0.0" = {}; - deps.cargo."0.35.0" = { - atty = "0.2.11"; - byteorder = "1.3.1"; - bytesize = "1.0.0"; - clap = "2.33.0"; - crates_io = "0.23.0"; - crossbeam_utils = "0.6.5"; - crypto_hash = "0.3.3"; - curl = "0.4.21"; - curl_sys = "0.4.18"; - env_logger = "0.6.1"; - failure = "0.1.5"; - filetime = "0.2.4"; - flate2 = "1.0.7"; - fs2 = "0.4.3"; - git2 = "0.8.0"; - git2_curl = "0.9.0"; - glob = "0.2.11"; - hex = "0.3.2"; - home = "0.3.4"; - ignore = "0.4.7"; - im_rc = "12.3.4"; - jobserver = "0.1.13"; - lazy_static = "1.3.0"; - lazycell = "1.2.1"; - libc = "0.2.51"; - libgit2_sys = "0.7.11"; - log = "0.4.6"; - num_cpus = "1.10.0"; - opener = "0.3.2"; - rustc_workspace_hack = "1.0.0"; - rustfix = "0.4.5"; - same_file = "1.0.4"; - semver = "0.9.0"; - serde = "1.0.90"; - serde_ignored = "0.0.4"; - serde_json = "1.0.39"; - shell_escape = "0.1.4"; - tar = "0.4.22"; - tempfile = "3.0.7"; - termcolor = "1.0.4"; - toml = "0.4.10"; - unicode_width = "0.1.5"; - url = "1.7.2"; - url_serde = "0.2.0"; - core_foundation = "0.6.4"; - fwdansi = "1.0.1"; - miow = "0.3.3"; - winapi = "0.3.7"; - }; - deps.cargo_vendor."0.1.23" = { - cargo = "0.35.0"; - docopt = "1.1.0"; - env_logger = "0.6.1"; - failure = "0.1.5"; - openssl = "0.10.20"; - serde = "1.0.90"; - serde_json = "1.0.39"; - toml = "0.5.0"; - }; - deps.cc."1.0.35" = {}; - deps.cfg_if."0.1.7" = {}; - deps.clap."2.33.0" = { - atty = "0.2.11"; - bitflags = "1.0.4"; - strsim = "0.8.0"; - textwrap = "0.11.0"; - unicode_width = "0.1.5"; - vec_map = "0.8.1"; - ansi_term = "0.11.0"; - }; - deps.cloudabi."0.0.3" = { - bitflags = "1.0.4"; - }; - deps.commoncrypto."0.2.0" = { - commoncrypto_sys = "0.2.0"; - }; - deps.commoncrypto_sys."0.2.0" = { - libc = "0.2.51"; - }; - deps.core_foundation."0.6.4" = { - core_foundation_sys = "0.6.2"; - libc = "0.2.51"; - }; - deps.core_foundation_sys."0.6.2" = {}; - deps.crates_io."0.23.0" = { - curl = "0.4.21"; - failure = "0.1.5"; - http = "0.1.17"; - serde = "1.0.90"; - serde_derive = "1.0.90"; - serde_json = "1.0.39"; - url = "1.7.2"; - }; - deps.crc."1.8.1" = { - build_const = "0.2.1"; - }; - deps.crc32fast."1.2.0" = { - cfg_if = "0.1.7"; - }; - deps.crossbeam_channel."0.3.8" = { - crossbeam_utils = "0.6.5"; - smallvec = "0.6.9"; - }; - deps.crossbeam_utils."0.6.5" = { - cfg_if = "0.1.7"; - lazy_static = "1.3.0"; - }; - deps.crypto_hash."0.3.3" = { - hex = "0.3.2"; - commoncrypto = "0.2.0"; - openssl = "0.10.20"; - winapi = "0.3.7"; - }; - deps.curl."0.4.21" = { - curl_sys = "0.4.18"; - libc = "0.2.51"; - socket2 = "0.3.8"; - openssl_probe = "0.1.2"; - openssl_sys = "0.9.43"; - kernel32_sys = "0.2.2"; - schannel = "0.1.15"; - winapi = "0.2.8"; - }; - deps.curl_sys."0.4.18" = { - libc = "0.2.51"; - libnghttp2_sys = "0.1.1"; - libz_sys = "1.0.25"; - cc = "1.0.35"; - pkg_config = "0.3.14"; - openssl_sys = "0.9.43"; - winapi = "0.3.7"; - }; - deps.docopt."1.1.0" = { - lazy_static = "1.3.0"; - regex = "1.1.6"; - serde = "1.0.90"; - strsim = "0.9.1"; - }; - deps.either."1.5.2" = {}; - deps.env_logger."0.6.1" = { - atty = "0.2.11"; - humantime = "1.2.0"; - log = "0.4.6"; - regex = "1.1.6"; - termcolor = "1.0.4"; - }; - deps.failure."0.1.5" = { - backtrace = "0.3.15"; - failure_derive = "0.1.5"; - }; - deps.failure_derive."0.1.5" = { - proc_macro2 = "0.4.27"; - quote = "0.6.12"; - syn = "0.15.32"; - synstructure = "0.10.1"; - }; - deps.filetime."0.2.4" = { - cfg_if = "0.1.7"; - redox_syscall = "0.1.54"; - libc = "0.2.51"; - }; - deps.flate2."1.0.7" = { - crc32fast = "1.2.0"; - libc = "0.2.51"; - libz_sys = "1.0.25"; - miniz_sys = "0.1.11"; - miniz_oxide_c_api = "0.2.1"; - }; - deps.fnv."1.0.6" = {}; - deps.foreign_types."0.3.2" = { - foreign_types_shared = "0.1.1"; - }; - deps.foreign_types_shared."0.1.1" = {}; - deps.fs2."0.4.3" = { - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.fuchsia_cprng."0.1.1" = {}; - deps.fwdansi."1.0.1" = { - memchr = "2.2.0"; - termcolor = "1.0.4"; - }; - deps.git2."0.8.0" = { - bitflags = "1.0.4"; - libc = "0.2.51"; - libgit2_sys = "0.7.11"; - log = "0.4.6"; - url = "1.7.2"; - openssl_probe = "0.1.2"; - openssl_sys = "0.9.43"; - }; - deps.git2_curl."0.9.0" = { - curl = "0.4.21"; - git2 = "0.8.0"; - log = "0.4.6"; - url = "1.7.2"; - }; - deps.glob."0.2.11" = {}; - deps.globset."0.4.3" = { - aho_corasick = "0.7.3"; - bstr = "0.1.2"; - fnv = "1.0.6"; - log = "0.4.6"; - regex = "1.1.6"; - }; - deps.hashbrown."0.1.8" = { - byteorder = "1.3.1"; - scopeguard = "0.3.3"; - }; - deps.hex."0.3.2" = {}; - deps.home."0.3.4" = { - scopeguard = "0.3.3"; - winapi = "0.3.7"; - }; - deps.http."0.1.17" = { - bytes = "0.4.12"; - fnv = "1.0.6"; - itoa = "0.4.3"; - }; - deps.humantime."1.2.0" = { - quick_error = "1.2.2"; - }; - deps.idna."0.1.5" = { - matches = "0.1.8"; - unicode_bidi = "0.3.4"; - unicode_normalization = "0.1.8"; - }; - deps.ignore."0.4.7" = { - crossbeam_channel = "0.3.8"; - globset = "0.4.3"; - lazy_static = "1.3.0"; - log = "0.4.6"; - memchr = "2.2.0"; - regex = "1.1.6"; - same_file = "1.0.4"; - thread_local = "0.3.6"; - walkdir = "2.2.7"; - winapi_util = "0.1.2"; - }; - deps.im_rc."12.3.4" = { - sized_chunks = "0.1.3"; - typenum = "1.10.0"; - rustc_version = "0.2.3"; - }; - deps.iovec."0.1.2" = { - libc = "0.2.51"; - winapi = "0.2.8"; - }; - deps.itertools."0.7.11" = { - either = "1.5.2"; - }; - deps.itoa."0.4.3" = {}; - deps.jobserver."0.1.13" = { - log = "0.4.6"; - libc = "0.2.51"; - rand = "0.6.5"; - }; - deps.kernel32_sys."0.2.2" = { - winapi = "0.2.8"; - winapi_build = "0.1.1"; - }; - deps.lazy_static."1.3.0" = {}; - deps.lazycell."1.2.1" = {}; - deps.libc."0.2.51" = {}; - deps.libgit2_sys."0.7.11" = { - curl_sys = "0.4.18"; - libc = "0.2.51"; - libssh2_sys = "0.2.11"; - libz_sys = "1.0.25"; - cc = "1.0.35"; - pkg_config = "0.3.14"; - openssl_sys = "0.9.43"; - }; - deps.libnghttp2_sys."0.1.1" = { - libc = "0.2.51"; - cc = "1.0.35"; - }; - deps.libssh2_sys."0.2.11" = { - libc = "0.2.51"; - libz_sys = "1.0.25"; - cc = "1.0.35"; - pkg_config = "0.3.14"; - openssl_sys = "0.9.43"; - }; - deps.libz_sys."1.0.25" = { - libc = "0.2.51"; - cc = "1.0.35"; - pkg_config = "0.3.14"; - }; - deps.lock_api."0.1.5" = { - scopeguard = "0.3.3"; - }; - deps.log."0.4.6" = { - cfg_if = "0.1.7"; - }; - deps.matches."0.1.8" = {}; - deps.matrixmultiply."0.1.15" = { - rawpointer = "0.1.0"; - }; - deps.memchr."2.2.0" = {}; - deps.miniz_sys."0.1.11" = { - libc = "0.2.51"; - cc = "1.0.35"; - }; - deps.miniz_oxide."0.2.1" = { - adler32 = "1.0.3"; - }; - deps.miniz_oxide_c_api."0.2.1" = { - crc = "1.8.1"; - libc = "0.2.51"; - miniz_oxide = "0.2.1"; - cc = "1.0.35"; - }; - deps.miow."0.3.3" = { - socket2 = "0.3.8"; - winapi = "0.3.7"; - }; - deps.ndarray."0.12.1" = { - itertools = "0.7.11"; - matrixmultiply = "0.1.15"; - num_complex = "0.2.1"; - num_traits = "0.2.6"; - }; - deps.num_complex."0.2.1" = { - num_traits = "0.2.6"; - }; - deps.num_traits."0.2.6" = {}; - deps.num_cpus."1.10.0" = { - libc = "0.2.51"; - }; - deps.once_cell."0.1.8" = { - parking_lot = "0.7.1"; - }; - deps.opener."0.3.2" = { - failure = "0.1.5"; - failure_derive = "0.1.5"; - winapi = "0.3.7"; - }; - deps.openssl."0.10.20" = { - bitflags = "1.0.4"; - cfg_if = "0.1.7"; - foreign_types = "0.3.2"; - lazy_static = "1.3.0"; - libc = "0.2.51"; - openssl_sys = "0.9.43"; - }; - deps.openssl_probe."0.1.2" = {}; - deps.openssl_src."111.2.1+1.1.1b" = { - cc = "1.0.35"; - }; - deps.openssl_sys."0.9.43" = { - libc = "0.2.51"; - cc = "1.0.35"; - openssl_src = "111.2.1+1.1.1b"; - pkg_config = "0.3.14"; - rustc_version = "0.2.3"; - }; - deps.parking_lot."0.7.1" = { - lock_api = "0.1.5"; - parking_lot_core = "0.4.0"; - }; - deps.parking_lot_core."0.4.0" = { - rand = "0.6.5"; - smallvec = "0.6.9"; - rustc_version = "0.2.3"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.percent_encoding."1.0.1" = {}; - deps.pkg_config."0.3.14" = {}; - deps.proc_macro2."0.4.27" = { - unicode_xid = "0.1.0"; - }; - deps.quick_error."1.2.2" = {}; - deps.quote."0.6.12" = { - proc_macro2 = "0.4.27"; - }; - deps.rand."0.6.5" = { - rand_chacha = "0.1.1"; - rand_core = "0.4.0"; - rand_hc = "0.1.0"; - rand_isaac = "0.1.1"; - rand_jitter = "0.1.3"; - rand_os = "0.1.3"; - rand_pcg = "0.1.2"; - rand_xorshift = "0.1.1"; - autocfg = "0.1.2"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.rand_chacha."0.1.1" = { - rand_core = "0.3.1"; - autocfg = "0.1.2"; - }; - deps.rand_core."0.3.1" = { - rand_core = "0.4.0"; - }; - deps.rand_core."0.4.0" = {}; - deps.rand_hc."0.1.0" = { - rand_core = "0.3.1"; - }; - deps.rand_isaac."0.1.1" = { - rand_core = "0.3.1"; - }; - deps.rand_jitter."0.1.3" = { - rand_core = "0.4.0"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.rand_os."0.1.3" = { - rand_core = "0.4.0"; - rdrand = "0.4.0"; - cloudabi = "0.0.3"; - fuchsia_cprng = "0.1.1"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.rand_pcg."0.1.2" = { - rand_core = "0.4.0"; - autocfg = "0.1.2"; - }; - deps.rand_xorshift."0.1.1" = { - rand_core = "0.3.1"; - }; - deps.rawpointer."0.1.0" = {}; - deps.rdrand."0.4.0" = { - rand_core = "0.3.1"; - }; - deps.redox_syscall."0.1.54" = {}; - deps.redox_termios."0.1.1" = { - redox_syscall = "0.1.54"; - }; - deps.regex."1.1.6" = { - aho_corasick = "0.7.3"; - memchr = "2.2.0"; - regex_syntax = "0.6.6"; - thread_local = "0.3.6"; - utf8_ranges = "1.0.2"; - }; - deps.regex_syntax."0.6.6" = { - ucd_util = "0.1.3"; - }; - deps.remove_dir_all."0.5.1" = { - winapi = "0.3.7"; - }; - deps.rustc_demangle."0.1.14" = {}; - deps.rustc_workspace_hack."1.0.0" = {}; - deps.rustc_version."0.2.3" = { - semver = "0.9.0"; - }; - deps.rustfix."0.4.5" = { - failure = "0.1.5"; - log = "0.4.6"; - serde = "1.0.90"; - serde_derive = "1.0.90"; - serde_json = "1.0.39"; - }; - deps.ryu."0.2.7" = {}; - deps.same_file."1.0.4" = { - winapi_util = "0.1.2"; - }; - deps.schannel."0.1.15" = { - lazy_static = "1.3.0"; - winapi = "0.3.7"; - }; - deps.scopeguard."0.3.3" = {}; - deps.semver."0.9.0" = { - semver_parser = "0.7.0"; - serde = "1.0.90"; - }; - deps.semver_parser."0.7.0" = {}; - deps.serde."1.0.90" = { - serde_derive = "1.0.90"; - }; - deps.serde_derive."1.0.90" = { - proc_macro2 = "0.4.27"; - quote = "0.6.12"; - syn = "0.15.32"; - }; - deps.serde_ignored."0.0.4" = { - serde = "1.0.90"; - }; - deps.serde_json."1.0.39" = { - itoa = "0.4.3"; - ryu = "0.2.7"; - serde = "1.0.90"; - }; - deps.shell_escape."0.1.4" = {}; - deps.sized_chunks."0.1.3" = { - typenum = "1.10.0"; - }; - deps.smallvec."0.6.9" = {}; - deps.socket2."0.3.8" = { - cfg_if = "0.1.7"; - libc = "0.2.51"; - redox_syscall = "0.1.54"; - winapi = "0.3.7"; - }; - deps.strsim."0.8.0" = {}; - deps.strsim."0.9.1" = { - hashbrown = "0.1.8"; - ndarray = "0.12.1"; - }; - deps.syn."0.15.32" = { - proc_macro2 = "0.4.27"; - quote = "0.6.12"; - unicode_xid = "0.1.0"; - }; - deps.synstructure."0.10.1" = { - proc_macro2 = "0.4.27"; - quote = "0.6.12"; - syn = "0.15.32"; - unicode_xid = "0.1.0"; - }; - deps.tar."0.4.22" = { - filetime = "0.2.4"; - redox_syscall = "0.1.54"; - libc = "0.2.51"; - }; - deps.tempfile."3.0.7" = { - cfg_if = "0.1.7"; - rand = "0.6.5"; - remove_dir_all = "0.5.1"; - redox_syscall = "0.1.54"; - libc = "0.2.51"; - winapi = "0.3.7"; - }; - deps.termcolor."1.0.4" = { - wincolor = "1.0.1"; - }; - deps.termion."1.5.1" = { - libc = "0.2.51"; - redox_syscall = "0.1.54"; - redox_termios = "0.1.1"; - }; - deps.textwrap."0.11.0" = { - unicode_width = "0.1.5"; - }; - deps.thread_local."0.3.6" = { - lazy_static = "1.3.0"; - }; - deps.toml."0.4.10" = { - serde = "1.0.90"; - }; - deps.toml."0.5.0" = { - serde = "1.0.90"; - }; - deps.typenum."1.10.0" = {}; - deps.ucd_util."0.1.3" = {}; - deps.unicode_bidi."0.3.4" = { - matches = "0.1.8"; - }; - deps.unicode_normalization."0.1.8" = { - smallvec = "0.6.9"; - }; - deps.unicode_width."0.1.5" = {}; - deps.unicode_xid."0.1.0" = {}; - deps.url."1.7.2" = { - idna = "0.1.5"; - matches = "0.1.8"; - percent_encoding = "1.0.1"; - }; - deps.url_serde."0.2.0" = { - serde = "1.0.90"; - url = "1.7.2"; - }; - deps.utf8_ranges."1.0.2" = {}; - deps.vcpkg."0.2.6" = {}; - deps.vec_map."0.8.1" = {}; - deps.walkdir."2.2.7" = { - same_file = "1.0.4"; - winapi = "0.3.7"; - winapi_util = "0.1.2"; - }; - deps.winapi."0.2.8" = {}; - deps.winapi."0.3.7" = { - winapi_i686_pc_windows_gnu = "0.4.0"; - winapi_x86_64_pc_windows_gnu = "0.4.0"; - }; - deps.winapi_build."0.1.1" = {}; - deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; - deps.winapi_util."0.1.2" = { - winapi = "0.3.7"; - }; - deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; - deps.wincolor."1.0.1" = { - winapi = "0.3.7"; - winapi_util = "0.1.2"; - }; -} diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix deleted file mode 100644 index f252c6a6cb1..00000000000 --- a/pkgs/build-support/rust/cargo-vendor/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchFromGitHub }: - -((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: { - src = fetchFromGitHub { - owner = "alexcrichton"; - repo = "cargo-vendor"; - rev = "9355661303ce2870d68a69d99953fce22581e31e"; - sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2"; - }; -}) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index b3ab9f5ba78..1c4fe9daead 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -15,11 +15,6 @@ in ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; }; - cargo-vendor = attrs: { - buildInputs = [ openssl zlib curl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - }; - libz-sys = attrs: { buildInputs = [ pkgconfig zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ce1bf800276..4634d32f6ac 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -86,6 +86,10 @@ stdenv.mkDerivation (args // { ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${rustHostConfig}"] "linker" = "${ccForHost}" + ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 + stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' + "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] + ''} ''} EOF diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 4e6058383d4..bc80db0947b 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, cargo-vendor, python3 }: +{ stdenv, cacert, git, cargo, python3 }: let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; @@ -20,7 +20,7 @@ in { name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; - nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ]; + nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; inherit src srcs patches sourceRoot; phases = "unpackPhase patchPhase installPhase"; diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix new file mode 100644 index 00000000000..ddb214c49e1 --- /dev/null +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchurl }: + +let + pname = "cascadia-code"; + version = "1909.16"; +in +fetchurl { + name = "${pname}-${version}"; + url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf"; + + downloadToTemp = true; + recursiveHash = true; + + postFetch = '' + install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf + ''; + + sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2"; + + meta = with lib; { + description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; + homepage = "https://github.com/microsoft/cascadia-code"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index f7fce315e8c..4864edde71d 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, + stdenv, lib, pkgs, fetchFromGitHub, fetchurl, nodejs, ttfautohint-nox, otfcc, @@ -8,7 +8,9 @@ design ? [], upright ? [], italic ? [], oblique ? [], family ? null, weights ? [], # Custom font set name. Required if any custom settings above. - set ? null + set ? null, + # Extra parameters. Can be used for ligature mapping. + extraParameters ? null }: assert (design != []) -> set != null; @@ -19,38 +21,43 @@ assert (family != null) -> set != null; assert (weights != []) -> set != null; let - installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; + system = builtins.currentSystem; + nodePackages = import ./node-packages.nix { inherit pkgs system nodejs; }; in let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.14.3"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf"; + sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv"; }; in with lib; -let unwords = concatStringsSep " "; in +let quote = str: "\"" + str + "\""; in +let toTomlList = list: "[" + (concatMapStringsSep ", " quote list) +"]"; in +let unlines = concatStringsSep "\n"; in let param = name: options: - if options != [] then "${name}='${unwords options}'" else null; - config = unwords (lib.filter (x: x != null) [ + if options != [] then "${name}=${toTomlList options}" else null; + config = unlines (lib.filter (x: x != null) [ + "[buildPlans.${pname}]" (param "design" design) (param "upright" upright) (param "italic" italic) (param "oblique" oblique) - (if family != null then "family='${family}'" else null) + (if family != null then "family=\"${family}\"" else null) (param "weights" weights) ]); - custom = design != [] || upright != [] || italic != [] || oblique != [] - || family != null || weights != []; + installNodeModules = unlines (lib.mapAttrsToList + (name: value: "mkdir -p node_modules/${name}\n cp -r ${value.outPath}/lib/node_modules/. node_modules") + nodePackages); in stdenv.mkDerivation { @@ -58,33 +65,25 @@ stdenv.mkDerivation { nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ]; - passAsFile = [ "installPackageLock" ]; - installPackageLock = installPackageLock ./package-lock.json; - - preConfigure = '' - HOME=$TMPDIR - source "$installPackageLockPath"; - npm --offline rebuild - ''; + passAsFile = [ "config" "extraParameters" ]; + config = config; + extraParameters = extraParameters; configurePhase = '' - runHook preConfigure - - ${optionalString custom ''make custom-config set=${set} ${config}''} - - runHook postConfigure + mkdir -p node_modules/.bin + ${installNodeModules} + ${optionalString (set != null) ''mv "$configPath" private-build-plans.toml''} + ${optionalString (extraParameters != null) ''cat "$extraParametersPath" >> parameters.toml''} ''; - makeFlags = lib.optionals custom [ "custom" "set=${set}" ]; + buildPhase = '' + npm run build -- ttf::${pname} + ''; installPhase = '' - runHook preInstall - fontdir="$out/share/fonts/$pname" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" - - runHook postInstall ''; enableParallelBuilding = true; @@ -98,6 +97,6 @@ stdenv.mkDerivation { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ]; + maintainers = with maintainers; [ cstrahan jfrankenau ttuegel babariviere ]; }; } diff --git a/pkgs/data/fonts/iosevka/generate.sh b/pkgs/data/fonts/iosevka/generate.sh new file mode 100644 index 00000000000..e7d675b9e76 --- /dev/null +++ b/pkgs/data/fonts/iosevka/generate.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +node2nix --nodejs-10 --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../../development/node-packages/node-env.nix diff --git a/pkgs/data/fonts/iosevka/node-packages-generated.nix b/pkgs/data/fonts/iosevka/node-packages-generated.nix new file mode 100644 index 00000000000..310e0161628 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages-generated.nix @@ -0,0 +1,4257 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "JSONStream-1.3.5" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "acorn-7.0.0" = { + name = "acorn"; + packageName = "acorn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz"; + sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="; + }; + }; + "acorn-jsx-5.0.2" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; + sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bezier-js-2.4.3" = { + name = "bezier-js"; + packageName = "bezier-js"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz"; + sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ=="; + }; + }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; + "bluebird-3.5.5" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "bufferstreams-2.0.1" = { + name = "bufferstreams"; + packageName = "bufferstreams"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz"; + sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "child-process-promise-2.2.1" = { + name = "child-process-promise"; + packageName = "child-process-promise"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz"; + sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; + }; + }; + "chownr-1.1.2" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "clipper-lib-1.0.0" = { + name = "clipper-lib"; + packageName = "clipper-lib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz"; + sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "complex.js-2.0.11" = { + name = "complex.js"; + packageName = "complex.js"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz"; + sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "css-2.2.4" = { + name = "css"; + packageName = "css"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz"; + sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; + }; + }; + "css-parse-2.0.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"; + sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; + }; + }; + "cubic2quad-1.1.1" = { + name = "cubic2quad"; + packageName = "cubic2quad"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz"; + sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decimal.js-10.2.0" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz"; + sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "escape-latex-1.2.0" = { + name = "escape-latex"; + packageName = "escape-latex"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz"; + sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escodegen-1.12.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz"; + sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg=="; + }; + }; + "escodegen-1.3.3" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + }; + "escope-1.0.3" = { + name = "escope"; + packageName = "escope"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz"; + sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d"; + }; + }; + "eslint-scope-5.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + }; + }; + "eslint-utils-1.4.2" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz"; + sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q=="; + }; + }; + "eslint-visitor-keys-1.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + }; + }; + "esmangle-1.0.1" = { + name = "esmangle"; + packageName = "esmangle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz"; + sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2"; + }; + }; + "espree-6.1.1" = { + name = "espree"; + packageName = "espree"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz"; + sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ=="; + }; + }; + "esprima-1.1.1" = { + name = "esprima"; + packageName = "esprima"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.0.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "esshorten-1.1.1" = { + name = "esshorten"; + packageName = "esshorten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz"; + sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9"; + }; + }; + "estraverse-1.5.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + }; + "estraverse-2.0.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz"; + sha1 = "5ae46963243600206674ccb24a09e16674fcdca1"; + }; + }; + "estraverse-4.1.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; + sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-1.0.0" = { + name = "esutils"; + packageName = "esutils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fast-levenshtein-1.0.7" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; + sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "file-entry-cache-5.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.1" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz"; + sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fraction.js-4.0.12" = { + name = "fraction.js"; + packageName = "fraction.js"; + version = "4.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz"; + sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="; + }; + }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; + }; + }; + "fs-extra-6.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; + }; + }; + "fs-minipass-1.2.6" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; + "glob-parent-5.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; + sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "graceful-fs-4.2.2" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "hosted-git-info-2.8.4" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "import-fresh-3.1.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz"; + sha512 = "PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "inquirer-6.5.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"; + sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "javascript-natural-sort-0.7.1" = { + name = "javascript-natural-sort"; + packageName = "javascript-natural-sort"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; + sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59"; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; + "levn-0.2.5" = { + name = "levn"; + packageName = "levn"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; + sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "mathjs-5.10.3" = { + name = "mathjs"; + packageName = "mathjs"; + version = "5.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz"; + sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw=="; + }; + }; + "megaminx-0.3.3" = { + name = "megaminx"; + packageName = "megaminx"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz"; + sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw=="; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "microbuffer-1.0.0" = { + name = "microbuffer"; + packageName = "microbuffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz"; + sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2"; + }; + }; + "mime-db-1.40.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + }; + }; + "mime-types-2.1.24" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minipass-2.5.1" = { + name = "minipass"; + packageName = "minipass"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; + sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; + }; + }; + "minizlib-1.2.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "node-gyp-4.0.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; + }; + }; + "node-version-1.2.0" = { + name = "node-version"; + packageName = "node-version"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz"; + sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "optionator-0.3.0" = { + name = "optionator"; + packageName = "optionator"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz"; + sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54"; + }; + }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.2.1" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.10" = { + name = "pako"; + packageName = "pako"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "patrisika-0.21.0" = { + name = "patrisika"; + packageName = "patrisika"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz"; + sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482"; + }; + }; + "patrisika-scopes-0.11.1" = { + name = "patrisika-scopes"; + packageName = "patrisika-scopes"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz"; + sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "promise-polyfill-6.1.0" = { + name = "promise-polyfill"; + packageName = "promise-polyfill"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz"; + sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057"; + }; + }; + "proper-lockfile-3.2.0" = { + name = "proper-lockfile"; + packageName = "proper-lockfile"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz"; + sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA=="; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.4.0" = { + name = "psl"; + packageName = "psl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "regexpp-2.0.1" = { + name = "regexpp"; + packageName = "regexpp"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "resolve-1.12.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; + sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "seed-random-2.2.0" = { + name = "seed-random"; + packageName = "seed-random"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz"; + sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54"; + }; + }; + "semaphore-async-await-1.5.1" = { + name = "semaphore-async-await"; + packageName = "semaphore-async-await"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; + sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "stack-trace-0.0.9" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-bom-buf-1.0.0" = { + name = "strip-bom-buf"; + packageName = "strip-bom-buf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; + sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; + }; + }; + "strip-bom-stream-3.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; + sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-json-comments-3.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; + sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "tar-4.4.10" = { + name = "tar"; + packageName = "tar"; + version = "4.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; + }; + }; + "temp-0.8.3" = { + name = "temp"; + packageName = "temp"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; + sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "tiny-emitter-2.1.0" = { + name = "tiny-emitter"; + packageName = "tiny-emitter"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "ts-process-promises-1.0.2" = { + name = "ts-process-promises"; + packageName = "ts-process-promises"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz"; + sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; + }; + }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; + "tslib-1.9.3" = { + name = "tslib"; + packageName = "tslib"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; + sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "typed-function-1.1.0" = { + name = "typed-function"; + packageName = "typed-function"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz"; + sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="; + }; + }; + "typo-geom-0.5.1" = { + name = "typo-geom"; + packageName = "typo-geom"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz"; + sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "v8-compile-cache-2.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.0.3" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; + sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-6.6.0" = { + name = "yargs"; + packageName = "yargs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-parser-13.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + }; + }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + }; +in +{ + caryll-shapeops = nodeEnv.buildNodePackage { + name = "caryll-shapeops"; + packageName = "caryll-shapeops"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz"; + sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og=="; + }; + dependencies = [ + sources."bezier-js-2.4.3" + sources."clipper-lib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Boolean operations and overlap removal for curves."; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + libspiro-js = nodeEnv.buildNodePackage { + name = "libspiro-js"; + packageName = "libspiro-js"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz"; + sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript libspiro port"; + homepage = https://github.com/be5invis/libspiro-js; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + megaminx = nodeEnv.buildNodePackage { + name = "megaminx"; + packageName = "megaminx"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz"; + sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw=="; + }; + dependencies = [ + sources."JSONStream-1.3.5" + sources."child-process-promise-2.2.1" + sources."clone-2.1.2" + sources."complex.js-2.0.11" + sources."core-util-is-1.0.2" + sources."cross-spawn-4.0.2" + sources."decimal.js-10.2.0" + sources."escape-latex-1.2.0" + sources."first-chunk-stream-2.0.0" + sources."fraction.js-4.0.12" + sources."fs-extra-3.0.1" + sources."graceful-fs-4.2.2" + sources."inherits-2.0.4" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."javascript-natural-sort-0.7.1" + sources."jsonfile-3.0.1" + sources."jsonparse-1.3.1" + sources."lru-cache-4.1.5" + sources."mathjs-5.10.3" + sources."node-version-1.2.0" + sources."process-nextick-args-2.0.1" + sources."promise-polyfill-6.1.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."seed-random-2.2.0" + sources."string_decoder-1.1.1" + sources."strip-bom-buf-1.0.0" + sources."strip-bom-stream-3.0.0" + sources."through-2.3.8" + sources."tiny-emitter-2.1.0" + sources."tslib-1.9.3" + sources."typed-function-1.1.0" + sources."typo-geom-0.5.1" + sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" + sources."which-1.3.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A typeface manipulation toolkit"; + homepage = "https://github.com/caryll/Megaminx#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + object-assign = nodeEnv.buildNodePackage { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "ES2015 `Object.assign()` ponyfill"; + homepage = "https://github.com/sindresorhus/object-assign#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + otfcc-ttcize = nodeEnv.buildNodePackage { + name = "otfcc-ttcize"; + packageName = "otfcc-ttcize"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz"; + sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ=="; + }; + dependencies = [ + sources."JSONStream-1.3.5" + sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" + sources."child-process-promise-2.2.1" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."code-point-at-1.1.0" + sources."cross-spawn-4.0.2" + sources."cubic2quad-1.1.1" + sources."decamelize-1.2.0" + sources."error-ex-1.3.2" + (sources."execa-0.7.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + ]; + }) + sources."find-up-2.1.0" + sources."fs-extra-4.0.3" + sources."get-caller-file-1.0.3" + sources."get-stream-3.0.0" + sources."graceful-fs-4.2.2" + sources."hosted-git-info-2.8.4" + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."jsonparse-1.3.1" + sources."lcid-1.0.0" + sources."load-json-file-2.0.0" + sources."locate-path-2.0.0" + sources."lru-cache-4.1.5" + (sources."megaminx-0.3.3" // { + dependencies = [ + sources."fs-extra-3.0.1" + sources."jsonfile-3.0.1" + ]; + }) + sources."mem-1.1.0" + sources."mimic-fn-1.2.0" + sources."node-version-1.2.0" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."promise-polyfill-6.1.0" + sources."pseudomap-1.0.2" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."rimraf-2.2.8" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."temp-0.8.3" + sources."through-2.3.8" + sources."universalify-0.1.2" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."y18n-3.2.1" + sources."yallist-2.1.2" + sources."yargs-8.0.2" + sources."yargs-parser-7.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + license = "Apache 2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + primitive-quadify-off-curves = nodeEnv.buildNodePackage { + name = "primitive-quadify-off-curves"; + packageName = "primitive-quadify-off-curves"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.6.3.tgz"; + sha512 = "NlkjdjHbXycTBGo9SDozAvOdmFDDOXuy4/rgmHsg1AB11QUbujybclmYWx1uPEgAELnh23S16KL5sD5uw540Ww=="; + }; + dependencies = [ + sources."complex.js-2.0.11" + sources."decimal.js-10.2.0" + sources."escape-latex-1.2.0" + sources."fraction.js-4.0.12" + sources."javascript-natural-sort-0.7.1" + sources."mathjs-5.10.3" + sources."seed-random-2.2.0" + sources."tiny-emitter-2.1.0" + sources."tslib-1.9.3" + sources."typed-function-1.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Quadify a Cubic with only off-curve points"; + license = "APLv2"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + toml = nodeEnv.buildNodePackage { + name = "toml"; + packageName = "toml"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz"; + sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "TOML parser for Node.js (parses TOML spec v0.4.0)"; + homepage = "https://github.com/BinaryMuse/toml-node#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + topsort = nodeEnv.buildNodePackage { + name = "topsort"; + packageName = "topsort"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz"; + sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Topological sort in JavaScript"; + homepage = https://github.com/samuelneff/topsort; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + ttf2woff = nodeEnv.buildNodePackage { + name = "ttf2woff"; + packageName = "ttf2woff"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz"; + sha1 = "871832240024b09db9570904c7c1928b8057c969"; + }; + dependencies = [ + sources."argparse-1.0.10" + sources."microbuffer-1.0.0" + sources."pako-1.0.10" + sources."sprintf-js-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Convert TTF font to WOFF"; + homepage = "https://github.com/fontello/ttf2woff#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + ttf2woff2 = nodeEnv.buildNodePackage { + name = "ttf2woff2"; + packageName = "ttf2woff2"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz"; + sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-6.10.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bindings-1.5.0" + sources."brace-expansion-1.1.11" + sources."bufferstreams-2.0.1" + sources."caseless-0.12.0" + sources."chownr-1.1.2" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-1.2.6" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."graceful-fs-4.2.2" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.5.1" + sources."minizlib-1.2.2" + sources."mkdirp-0.5.1" + sources."nan-2.14.0" + sources."node-gyp-4.0.0" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.4.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.6" + sources."request-2.88.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."semver-5.3.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sshpk-1.16.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."tar-4.4.10" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.3" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Convert TTF files to WOFF2 ones."; + homepage = https://github.com/nfroidure/ttf2woff2; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + unorm = nodeEnv.buildNodePackage { + name = "unorm"; + packageName = "unorm"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz"; + sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read <http://unicode.org/reports/tr15/> UAX #15 Unicode Normalization Forms."; + homepage = "https://github.com/walling/unorm#readme"; + license = "MIT or GPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + verda = nodeEnv.buildNodePackage { + name = "verda"; + packageName = "verda"; + version = "1.0.0-4"; + src = fetchurl { + url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz"; + sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A=="; + }; + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."bluebird-3.5.5" + sources."camelcase-5.3.1" + sources."chalk-2.4.2" + sources."cli-cursor-2.1.0" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."cross-spawn-6.0.5" + sources."decamelize-1.2.0" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."execa-1.0.0" + sources."fast-deep-equal-2.0.1" + sources."find-up-3.0.0" + sources."fs-extra-6.0.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."graceful-fs-4.2.2" + sources."has-flag-3.0.0" + sources."invert-kv-2.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."map-age-cleaner-0.1.3" + (sources."mem-4.3.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."mimic-fn-1.2.0" + sources."nice-try-1.0.5" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."proper-lockfile-3.2.0" + sources."pump-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."restore-cursor-2.0.0" + sources."retry-0.12.0" + sources."semaphore-async-await-1.5.1" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."split-1.0.1" + sources."stack-trace-0.0.9" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."through-2.3.8" + sources."ts-process-promises-1.0.2" + sources."tslib-1.10.0" + sources."universalify-0.1.2" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Build Directly."; + license = "APLv2"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + yargs = nodeEnv.buildNodePackage { + name = "yargs"; + packageName = "yargs"; + version = "14.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz"; + sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow=="; + }; + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."camelcase-5.3.1" + sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."decamelize-1.2.0" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."set-blocking-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."which-module-2.0.0" + sources."wrap-ansi-5.1.0" + sources."y18n-4.0.0" + sources."yargs-parser-13.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "yargs the modern, pirate-themed, successor to optimist."; + homepage = https://yargs.js.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + colors = nodeEnv.buildNodePackage { + name = "colors"; + packageName = "colors"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; + sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "get colors in your node.js console"; + homepage = https://github.com/Marak/colors.js; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + patel = nodeEnv.buildNodePackage { + name = "patel"; + packageName = "patel"; + version = "0.33.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz"; + sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg=="; + }; + dependencies = [ + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + sources."code-point-at-1.1.0" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."error-ex-1.3.2" + sources."escodegen-1.12.0" + (sources."escope-1.0.3" // { + dependencies = [ + sources."estraverse-2.0.0" + ]; + }) + (sources."esmangle-1.0.1" // { + dependencies = [ + sources."escodegen-1.3.3" + sources."esprima-1.1.1" + sources."estraverse-1.5.1" + sources."esutils-1.0.0" + sources."fast-levenshtein-1.0.7" + sources."levn-0.2.5" + sources."optionator-0.3.0" + sources."source-map-0.1.43" + sources."wordwrap-0.0.3" + ]; + }) + sources."esprima-3.1.3" + (sources."esshorten-1.1.1" // { + dependencies = [ + sources."estraverse-4.1.1" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."fast-levenshtein-2.0.6" + sources."find-up-1.1.2" + sources."get-caller-file-1.0.3" + sources."graceful-fs-4.2.2" + sources."hosted-git-info-2.8.4" + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-utf8-0.2.1" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."load-json-file-1.1.0" + sources."normalize-package-data-2.5.0" + sources."number-is-nan-1.0.1" + sources."optionator-0.8.2" + sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-parse-1.0.6" + sources."path-type-1.1.0" + sources."patrisika-0.21.0" + sources."patrisika-scopes-0.11.1" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prelude-ls-1.1.2" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."resumer-0.0.0" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."through-2.3.8" + sources."type-check-0.3.2" + sources."validate-npm-package-license-3.0.4" + sources."which-module-1.0.0" + sources."wordwrap-1.0.0" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" + sources."yargs-6.6.0" + sources."yargs-parser-4.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Patrisika-based Example Language"; + homepage = "https://github.com/be5invis/patel#readme"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + patrisika-scopes = nodeEnv.buildNodePackage { + name = "patrisika-scopes"; + packageName = "patrisika-scopes"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz"; + sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "patrisika-scopes ================ A library for Patrisika's scopes."; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + eslint = nodeEnv.buildNodePackage { + name = "eslint"; + packageName = "eslint"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz"; + sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA=="; + }; + dependencies = [ + sources."@babel/code-frame-7.5.5" + sources."@babel/highlight-7.5.0" + sources."acorn-7.0.0" + sources."acorn-jsx-5.0.2" + sources."ajv-6.10.2" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."astral-regex-1.0.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."callsites-3.1.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.1.1" + sources."deep-is-0.1.3" + sources."doctrine-3.0.0" + sources."emoji-regex-7.0.3" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-5.0.0" + sources."eslint-utils-1.4.2" + sources."eslint-visitor-keys-1.1.0" + sources."espree-6.1.1" + sources."esprima-4.0.1" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."external-editor-3.1.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."flatted-2.0.1" + sources."fs.realpath-1.0.0" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."globals-11.12.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.24" + sources."ignore-4.0.6" + sources."import-fresh-3.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inquirer-6.5.2" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-promise-2.1.0" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."levn-0.3.0" + sources."lodash-4.17.15" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."natural-compare-1.4.0" + sources."nice-try-1.0.5" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + sources."os-tmpdir-1.0.2" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."progress-2.0.3" + sources."punycode-2.1.1" + sources."regexpp-2.0.1" + sources."resolve-from-4.0.0" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.3" + sources."run-async-2.3.0" + sources."rxjs-6.5.3" + sources."safer-buffer-2.1.2" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-2.1.0" + sources."sprintf-js-1.0.3" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-json-comments-3.0.1" + sources."supports-color-5.5.0" + (sources."table-5.4.6" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."tslib-1.10.0" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."v8-compile-cache-2.1.0" + sources."which-1.3.1" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An AST-based pattern checker for JavaScript."; + homepage = https://eslint.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + stylus = nodeEnv.buildNodePackage { + name = "stylus"; + packageName = "stylus"; + version = "0.54.7"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz"; + sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="; + }; + dependencies = [ + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + (sources."css-2.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-parse-2.0.0" + sources."debug-3.1.0" + sources."decode-uri-component-0.2.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."resolve-url-0.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-6.3.0" + sources."source-map-0.7.3" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."urix-0.1.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Robust, expressive, and feature-rich CSS superset"; + homepage = https://github.com/stylus/stylus; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +}
\ No newline at end of file diff --git a/pkgs/data/fonts/iosevka/node-packages.json b/pkgs/data/fonts/iosevka/node-packages.json new file mode 100644 index 00000000000..468f788f9f3 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages.json @@ -0,0 +1,20 @@ +[ + "caryll-shapeops", + "libspiro-js", + "megaminx", + "object-assign", + "otfcc-ttcize", + "primitive-quadify-off-curves", + "toml", + "topsort", + "ttf2woff", + "ttf2woff2", + "unorm", + "verda", + "yargs", + "colors", + "patel", + "patrisika-scopes", + "eslint", + "stylus" +] diff --git a/pkgs/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix new file mode 100644 index 00000000000..41e23864c44 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +}
\ No newline at end of file diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json deleted file mode 100644 index 54de11a1f42..00000000000 --- a/pkgs/data/fonts/iosevka/package-lock.json +++ /dev/null @@ -1,1025 +0,0 @@ -{ - "name": "iosevka", - "version": "1.14.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "JSONStream": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", - "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "bezier-js": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz", - "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==" - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" - }, - "caryll-shapeops": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz", - "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==", - "requires": { - "bezier-js": "2.2.5", - "clipper-lib": "1.0.0" - } - }, - "child-process-promise": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", - "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", - "requires": { - "cross-spawn": "4.0.2", - "node-version": "1.1.0", - "promise-polyfill": "6.1.0" - } - }, - "clipper-lib": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz", - "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "coffee-script": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", - "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==" - }, - "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, - "cubic2quad": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz", - "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU=" - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "1.0.3" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "requires": { - "is-arrayish": "0.2.1" - } - }, - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } - }, - "escope": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz", - "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=", - "requires": { - "estraverse": "2.0.0" - }, - "dependencies": { - "estraverse": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz", - "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=" - } - } - }, - "esmangle": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz", - "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=", - "requires": { - "escodegen": "1.3.3", - "escope": "1.0.3", - "esprima": "1.1.1", - "esshorten": "1.1.1", - "estraverse": "1.5.1", - "esutils": "1.0.0", - "optionator": "0.3.0", - "source-map": "0.1.43" - }, - "dependencies": { - "escodegen": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", - "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", - "requires": { - "esprima": "1.1.1", - "estraverse": "1.5.1", - "esutils": "1.0.0", - "source-map": "0.1.43" - } - }, - "esprima": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", - "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=" - }, - "estraverse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", - "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=" - }, - "esutils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", - "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=" - }, - "fast-levenshtein": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", - "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=" - }, - "levn": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", - "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } - }, - "optionator": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz", - "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=", - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "1.0.7", - "levn": "0.2.5", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "0.0.3" - } - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "requires": { - "amdefine": "1.0.1" - } - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - } - } - }, - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - }, - "esshorten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz", - "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=", - "requires": { - "escope": "1.0.3", - "estraverse": "4.1.1", - "esutils": "2.0.2" - }, - "dependencies": { - "estraverse": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", - "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=" - } - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - } - } - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", - "universalify": "0.1.1" - } - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", - "requires": { - "graceful-fs": "4.1.11" - } - }, - "jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "1.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } - }, - "libspiro-js": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz", - "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk=" - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - } - } - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, - "megaminx": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", - "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", - "requires": { - "JSONStream": "1.3.2", - "child-process-promise": "2.2.1", - "cubic2quad": "1.1.1", - "fs-extra": "3.0.1", - "which": "1.3.0" - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "requires": { - "mimic-fn": "1.2.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "node-version": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz", - "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg==" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "requires": { - "lcid": "1.0.0" - } - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", - "requires": { - "p-try": "1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "1.2.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - }, - "pad": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", - "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==", - "requires": { - "coffee-script": "1.12.7", - "wcwidth": "1.0.1" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "requires": { - "error-ex": "1.3.1" - } - }, - "patel": { - "version": "0.32.1", - "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz", - "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=", - "requires": { - "escodegen": "1.9.0", - "esmangle": "1.0.1", - "patrisika": "0.21.0", - "resumer": "0.0.0", - "yargs": "6.6.0" - }, - "dependencies": { - "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - } - } - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "patrisika": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz", - "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=", - "requires": { - "patrisika-scopes": "0.11.0" - } - }, - "patrisika-scopes": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz", - "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM=" - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "requires": { - "pinkie": "2.0.4" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" - }, - "promise-polyfill": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", - "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "resumer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", - "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", - "requires": { - "through": "2.3.8" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "optional": true - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "toml": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz", - "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==" - }, - "topsort": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz", - "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE=" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "1.1.2" - } - }, - "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" - }, - "unorm": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", - "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=" - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "requires": { - "defaults": "1.0.3" - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "requires": { - "isexe": "2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "requires": { - "camelcase": "4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "requires": { - "camelcase": "3.0.0" - } - } - } -} diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix deleted file mode 100644 index 546482cc0d2..00000000000 --- a/pkgs/data/fonts/iosevka/package-lock.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ lib, fetchurl }: - -with lib; with builtins; - -let - # Convert a base64-encoded string into a list of quads and padding. - fromBase64 = str: - let - len = stringLength str; - quads = 3 * len - 4 * padding; - padding = - if hasSuffix "==" str then 2 else - if hasSuffix "=" str then 1 else - 0; - chars = stringToCharacters (substring 0 (len - padding) str); - table = { - A = [0 0 0]; - B = [0 0 1]; - C = [0 0 2]; - D = [0 0 3]; - E = [0 1 0]; - F = [0 1 1]; - G = [0 1 2]; - H = [0 1 3]; - I = [0 2 0]; - J = [0 2 1]; - K = [0 2 2]; - L = [0 2 3]; - M = [0 3 0]; - N = [0 3 1]; - O = [0 3 2]; - P = [0 3 3]; - Q = [1 0 0]; - R = [1 0 1]; - S = [1 0 2]; - T = [1 0 3]; - U = [1 1 0]; - V = [1 1 1]; - W = [1 1 2]; - X = [1 1 3]; - Y = [1 2 0]; - Z = [1 2 1]; - a = [1 2 2]; - b = [1 2 3]; - c = [1 3 0]; - d = [1 3 1]; - e = [1 3 2]; - f = [1 3 3]; - g = [2 0 0]; - h = [2 0 1]; - i = [2 0 2]; - j = [2 0 3]; - k = [2 1 0]; - l = [2 1 1]; - m = [2 1 2]; - n = [2 1 3]; - o = [2 2 0]; - p = [2 2 1]; - q = [2 2 2]; - r = [2 2 3]; - s = [2 3 0]; - t = [2 3 1]; - u = [2 3 2]; - v = [2 3 3]; - w = [3 0 0]; - x = [3 0 1]; - y = [3 0 2]; - z = [3 0 3]; - "0" = [3 1 0]; - "1" = [3 1 1]; - "2" = [3 1 2]; - "3" = [3 1 3]; - "4" = [3 2 0]; - "5" = [3 2 1]; - "6" = [3 2 2]; - "7" = [3 2 3]; - "8" = [3 3 0]; - "9" = [3 3 1]; - "+" = [3 3 2]; - "/" = [3 3 3]; - }; - in - take quads (concatMap (c: table.${c}) chars); - - # Convert a list of quads with padding into a base16-encoded string. - toBase16 = quads: - if length quads == 0 then "" else - if length quads == 1 then throw "toBase16: odd quads" else - let - hexad = 4 * elemAt quads 0 + elemAt quads 1; - hexits = "0123456789abcdef"; - in - substring hexad 1 hexits + toBase16 (drop 2 quads); -in - -let - fetchResolved = { resolved, integrity, ... }: - let args = { url = resolved; } // integrityHash integrity; in - fetchurl args; - integrityHash = integrity: - if hasPrefix "sha1-" integrity then integritySHA1 integrity else - if hasPrefix "sha512-" integrity then integritySHA512 integrity else - throw "don't understand integrity: ${integrity}"; - integritySHA1 = integrity: - { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); }; - integritySHA512 = integrity: - { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); }; -in - -let - depend = name: attrs@{ version, dependencies ? {}, ... }: - { - inherit name version; - src = fetchResolved attrs; - depends = mapAttrsToList depend dependencies; - }; - prepareDepend = { name, src, depends, ... }: - '' - unpackFile '${src}' - mv package '${name}' - mkdir -p '${name}/node_modules' - ( - cd '${name}/node_modules' - ${concatMapStrings prepareDepend depends} - ) - ''; -in - -packageLockFile: - -let - packageLock = fromJSON (readFile packageLockFile); - depends = mapAttrsToList depend packageLock.dependencies; -in - '' - mkdir -p node_modules - ( - cd node_modules - ${concatMapStrings prepareDepend depends} - ) - '' - diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index e8784d90e7f..59cff1b0f47 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vista-fonts-1"; - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; + url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe; postFetch = '' ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile @@ -21,7 +21,7 @@ fetchzip { done ''; - sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11"; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; @@ -31,6 +31,5 @@ fetchzip { # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; - broken = true; # source url is 404 }; } diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix new file mode 100644 index 00000000000..e15e64c2101 --- /dev/null +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, gtk3 }: + +stdenv.mkDerivation rec { + pname = "papirus-maia-icon-theme"; + version = "2019-07-26"; + + src = fetchFromGitHub { + owner = "Ste74"; + repo = pname; + rev = "90d47c817cc0edeed8b5a90335e669948ff4a116"; + sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p"; + }; + + nativeBuildInputs = [ + cmake + gtk3 + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace /usr "$out" + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Manjaro variation of Papirus icon theme"; + homepage = https://github.com/Ste74/papirus-maia-icon-theme; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index dc54c1499fb..8dcfacadb49 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190910"; + version = "20190917"; src = fetchFromGitHub { owner = "arc-design"; repo = pname; rev = version; - sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j"; + sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index bfbf98b508e..b9de3743daf 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2019-07"; + version = "2019-09-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = "v${version}"; - sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i"; + sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix new file mode 100644 index 00000000000..2302aa301e3 --- /dev/null +++ b/pkgs/data/themes/yaru/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, + python3, gtk3, gnome3, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "yaru"; + version = "19.10.2"; + + src = fetchFromGitHub { + owner = "ubuntu"; + repo = "yaru"; + rev = version; + sha256 = "1azyn8pr0kpbq4wlz91f5amqyxqq0x2mxkglzl488sf39fl0gnbj"; + }; + + nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + postPatch = "patchShebangs ."; + + meta = with stdenv.lib; { + description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; + homepage = https://github.com/ubuntu/yaru; + license = with licenses; [ cc-by-sa-40 gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.jD91mZM2 ]; + }; +} diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b2a9d398709..a5724385e41 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, - xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, - xkeyboard_config, pcre, +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc, + bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi, + libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, + xkeyboard_config, bluetoothSupport ? true, bluez5, pulseSupport ? !stdenv.isDarwin, libpulseaudio, @@ -17,27 +17,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson - ninja (pkgconfig.override { vanilla = true; }) gettext + meson + ninja ]; buildInputs = [ + alsaLib + bc # for the Everything module calculator mode + bzip2 efl + gdbm libXdmcp - libxcb - xcbutilkeysyms libXrandr libffi - pam - alsaLib - luajit - bzip2 libpthreadstubs - gdbm - pcre + libxcb + luajit mesa + pam + pcre + xcbutilkeysyms xkeyboard_config ] ++ stdenv.lib.optional stdenv.isLinux libcap @@ -68,6 +69,9 @@ stdenv.mkDerivation rec { substituteInPlace src/bin/e_import_config_dialog.c \ --replace "e_prefix_bin_get()" "\"${efl}/bin\"" + + substituteInPlace src/modules/everything/evry_plug_calc.c \ + --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\"" ''; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 039d75beb4f..aed08c35a80 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -90,9 +90,7 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-default-settings = callPackage ./desktop/elementary-default-settings { }; - elementary-greeter = callPackage ./desktop/elementary-greeter { - inherit (gnome3) gnome-desktop; - }; + elementary-greeter = callPackage ./desktop/elementary-greeter { }; elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 8ef85b90a3b..963418feec0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,12 +1,33 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, meson -, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon -, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators -, elementary-gtk-theme, nixos-artwork, lightdm, numlockx -, clutter-gtk, libGL, dbus, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, linkFarm +, elementary-greeter +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, elementary-settings-daemon +, mutter +, elementary-icon-theme +, wingpanel-with-indicators +, elementary-gtk-theme +, nixos-artwork +, lightdm +, gdk-pixbuf +, clutter-gtk +, dbus +, accountsservice +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "3.3.1"; + version = "5.0"; repoName = "greeter"; @@ -14,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc"; + sha256 = "01c8acarxwpakyq69xm4bjwppjf8v3ijmns8masd8raxligb2v8b"; }; passthru = { @@ -22,6 +43,11 @@ stdenv.mkDerivation rec { inherit repoName; attrPath = pname; }; + + xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ + path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; + name = "io.elementary.greeter.desktop"; + }]; }; nativeBuildInputs = [ @@ -34,38 +60,32 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gtk - elementary-icon-theme + accountsservice + clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-gtk-theme + elementary-icon-theme elementary-settings-daemon - gnome-desktop + gdk-pixbuf granite gtk3 libgee - libGL lightdm mutter wingpanel-with-indicators ]; - patches = [ - (substituteAll { - src = ./gsd.patch; - elementary_settings_daemon = "${elementary-settings-daemon}/libexec/"; - }) - (substituteAll { - src = ./numlockx.patch; - inherit numlockx; - }) - ./01-sysconfdir-install.patch - ./hardcode-theme.patch - ]; - mesonFlags = [ # A hook does this but after wrapGAppsHook so the files never get wrapped. "--sbindir=${placeholder "out"}/bin" # baked into the program for discovery of the greeter configuration "--sysconfdir=/etc" + # We use the patched gnome-settings-daemon + "-Dubuntu-patched-gsd=true" + "-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed + ]; + + patches = [ + ./sysconfdir-install.patch ]; preFixup = '' @@ -76,18 +96,19 @@ stdenv.mkDerivation rec { # for `wingpanel -g` --prefix PATH : "${wingpanel-with-indicators}/bin" - # TODO: they should be using meson for this - # See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451 + # for the compositor --prefix PATH : "$out/bin" ) ''; postFixup = '' - substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ - --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" - + # Use NixOS default wallpaper substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \ - --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \ + "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + + substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ + --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch deleted file mode 100644 index bcbf604c6a2..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 2450c1a..a908d11 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,7 +1,7 @@ - conf_data = configuration_data() - conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) - conf_data.set('GETTEXT_PACKAGE', meson.project_name()) --conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') -+conf_data.set('GSD_DIR', '@elementary_settings_daemon@') - conf_data.set('VERSION', meson.project_version()) - config_header = configure_file ( - input: 'config.vala.in', diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch deleted file mode 100644 index e9263aab736..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala -index 11aa4c0..daf4a8a 100644 ---- a/src/PantheonGreeter.vala -+++ b/src/PantheonGreeter.vala -@@ -474,6 +474,10 @@ public static int main (string [] args) { - Gdk.CursorType.LEFT_PTR); - Gdk.get_default_root_window ().set_cursor (cursor); - -+ var settings = Gtk.Settings.get_default (); -+ settings.gtk_icon_theme_name = "elementary"; -+ settings.gtk_theme_name = "elementary"; -+ - var icon_theme = Gtk.IconTheme.get_default (); - icon_theme.add_resource_path ("/io/elementary/greeter/icons"); - diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch deleted file mode 100644 index 2c7766b4284..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala -index 11aa4c0..ae7bf7e 100644 ---- a/src/PantheonGreeter.vala -+++ b/src/PantheonGreeter.vala -@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window { - warning (e.message); - } - if (activate_numlock) { -- Granite.Services.System.execute_command ("/usr/bin/numlockx on"); -+ Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on"); - } - - var screensaver_timeout = 60; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch index 626e56ce596..9bacbcf4f98 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch @@ -1,14 +1,14 @@ -From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001 +From 7bb0d507cbb0122f167127b9f6460bd53d8234de Mon Sep 17 00:00:00 2001 From: worldofpeace <worldofpeace@users.noreply.github.com> -Date: Tue, 17 Jul 2018 07:04:18 -0400 -Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install +Date: Sat, 16 Mar 2019 16:07:24 -0400 +Subject: [PATCH] 'sysconfdir' will be etc not /etc for install --- data/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build -index 7621b03..7c08eaf 100644 +index fd54b75..b1120ae 100644 --- a/data/meson.build +++ b/data/meson.build @@ -20,7 +20,7 @@ i18n.merge_file ( @@ -19,7 +19,7 @@ index 7621b03..7c08eaf 100644 + install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm') ) - install_data( + test ( -- -2.17.1 +2.19.2 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index b98c205d491..06f0fc23a39 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -14,6 +14,8 @@ , mutter , json-glib , python3 +, elementary-gtk-theme +, elementary-icon-theme }: stdenv.mkDerivation rec { @@ -44,6 +46,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-gtk-theme + elementary-icon-theme gala granite gtk3 diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index 294dfa92c79..0e2c8c1696b 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -93,8 +93,6 @@ makeScope newScope (self: with self; { ## COMMON PARTS WITH XFCE 4.12 - gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; }; - xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { }; xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; @@ -113,7 +111,6 @@ makeScope newScope (self: with self; { ## ALIASES - - # added 2019-08-18 - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; + xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 + gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 }) diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 02aa6567c1a..6bcfcfc3023 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -103,6 +103,6 @@ rec { cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include chmod +w $out/include cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include - ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib + ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib ''; } diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 2897bac0614..840fbff60eb 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { # avrdude_bin is linked against libtinfo.so.5 mkdir $out/lib/ - ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 + ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5 ${stdenv.lib.optionalString withTeensyduino '' # Patch the Teensy loader binary diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index d92d712a3ff..eea75c5ace1 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, flex, bison, pkgconfig, which -, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig +, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig }: stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z"; }; - nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ]; - buildInputs = lib.optionals pythonSupport [ python2 ]; + nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; + buildInputs = lib.optionals pythonSupport [ python ]; postPatch = '' patchShebangs pylibfdt/ ''; - makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ]; + makeFlags = [ "PYTHON=python" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ce18200943e..676fa19d9e8 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; }; - hsPkgs = haskell.packages.ghc864.override { + hsPkgs = haskell.packages.ghc865.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 129ca72251f..e25c7b6016a 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -186,7 +186,12 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else ""); + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 506cfee7f49..de4d893b99e 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -185,7 +185,12 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else ""); + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix deleted file mode 100644 index 2e500db536c..00000000000 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx -, bash -, runCommand - -, libiconv ? null, ncurses - -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.useiOSPrebuilt - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv - ++ stdenv.lib.optional enableDwarf elfutils; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.2.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch { # Fix STRIP to be substituted from configure - url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; - sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; - }) - (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) - ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform) [ - # Cherry-pick a few commits from newer hsc2hs so that proper binary is - # installed -- stage 2 normally but stage 1 with cross. - # - # TODO make unconditional next mass rebuild. - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/ecdac062b5cf1d284906487849c56f4e149b3c8e"; - sha256 = "1gagswi26j50z44sdx0mk1sb3wr0nrqyaph9j724zp6iwqslxyzm"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/598303cbffcd230635fbce28ce4105d177fdf76a"; - sha256 = "0hqcg434qbh1bz1pk85cap2q4v9i8bs6x65yzq4spz6xk3zq6af7"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/9483ad10064fbbb97ab525280623826b1ef63959"; - sha256 = "1cpfdhfc0cz9xkjzkcgwx4fbyj96dkmd04wpwi1vji7fahw8kmf3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch"; - sha256 = "1hxj80bjx0x3w0f35cj3k2wipppr1ald03jwfy5q0xlxygdha17w"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch"; - sha256 = "12xsln3zyfpvml8bwdpbc003h6zl1qh2qcq1rhdrw02n45dz8lvc"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch"; - sha256 = "03dcqf5af3vjhrky3f2z26j4d9h8qd9nkv76xp0l97h4cqk7vfqb"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch"; - sha256 = "0pi2m85wjxaaablq6n4q5vyn9qxvry5d7nmja4b28i68yb4ly9g1"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch"; - sha256 = "1fszfavf1cvrf02x500mi7jykcpvpl2i7i4qzr2qz9sbmyq063f0"; - }) - ] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism - url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; - sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; - }) - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [ - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" - ]; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - nativeBuildInputs = [ - autoconf autoreconfHook automake perl python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.2.2"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 2fbdff865ed..52fb926cdc6 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,9 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -74,8 +71,7 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -184,8 +180,6 @@ stdenv.mkDerivation (rec { ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix deleted file mode 100644 index 151e80198f4..00000000000 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ /dev/null @@ -1,257 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.6.4"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - }) - (fetchpatch { # https://github.com/haskell/haddock/issues/900 - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; - name = "loadpluginsinmodules.diff"; - sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.4"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 0a218c29264..cdbcb8e1aed 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -7,9 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -79,8 +76,7 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -183,8 +179,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 3783b97795a..95bbab3cb3e 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -7,9 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -79,8 +76,7 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -168,8 +164,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix deleted file mode 100644 index bc803b74617..00000000000 --- a/pkgs/development/compilers/ghc/abi-depends-determinism.nix +++ /dev/null @@ -1,12 +0,0 @@ -# https://phabricator.haskell.org/D4159 to fix non-determinism in -# cached abi-depends fields in package databases, modified to only -# contain hunks that exist in distribution tarballs. -{ fetchpatch, runCommand }: let - base = fetchpatch rec { # Non-determinism in cached abi-depends fields - # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D4159.diff"; - sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; - }; -in runCommand base.name {} - "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index cbc404de862..b78f5bc2204 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,9 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support - , useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -76,8 +73,7 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -180,8 +176,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index 53b6dd43134..c54c782fafa 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -2,6 +2,10 @@ let inherit (haskellLib) doJailbreak dontHaddock; in self: super: { + ghc-api-ghcjs = super.ghc-api-ghcjs.override + { + happy = self.happy_1_19_5; + }; haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/pkgs/development/compilers/ghcjs-ng/8.6/git.json index 37861b96e7a..1114e1a1290 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/git.json +++ b/pkgs/development/compilers/ghcjs-ng/8.6/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075", - "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj", + "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874", + "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy", "fetchSubmodules": true } diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index a89ab15c55f..b957a6aa9e1 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -59,20 +59,21 @@ }) {}; ghc-api-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers + ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs + , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs , terminfo, time, transformers, unix }: mkDerivation { pname = "ghc-api-ghcjs"; - version = "8.6.2"; + version = "8.6.5"; src = configuredSrc + /lib/ghc-api-ghcjs; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process template-haskell-ghcjs terminfo time transformers unix ]; + libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; description = "The GHC API (customized for GHCJS)"; license = stdenv.lib.licenses.bsd3; @@ -107,7 +108,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "https://github.com/ghcjs"; + homepage = "http://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index 52f3ad497ad..00a071651ed 100644 --- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -1,8 +1,7 @@ -{ haskellLib, alex, happy }: +{ haskellLib }: let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; in self: super: { - ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; system-fileio = doJailbreak super.system-fileio; diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 068d7b578df..e668be8e074 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -34,7 +34,6 @@ let (callPackage ./common-overrides.nix { inherit haskellLib; - inherit (bootPkgs) alex happy; }) ghcjsDepOverrides ]); diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 1349b7f0ddd..a6e3dfff4e0 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -14,6 +14,11 @@ let drv = stdenv.mkDerivation rec { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz"; sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi"; } + else if stdenv.hostPlatform.system == "x86_64-darwin" then + fetchurl { + url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz"; + sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd"; + } else throw "unsupported system: ${stdenv.hostPlatform.system}"; @@ -28,20 +33,20 @@ let drv = stdenv.mkDerivation rec { jrePath=$out/jre ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; ''; - rpath = lib.makeLibraryPath ([ + rpath = lib.optionalString (!stdenv.isDarwin) (lib.makeLibraryPath ([ stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib (placeholder "out") ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm - ])) + ":${placeholder "out"}/lib/jli"; + ])) + ":${placeholder "out"}/lib/jli"); passthru.home = drv; @@ -61,6 +66,6 @@ let drv = stdenv.mkDerivation rec { homepage = "https://bintray.com/jetbrains/intellij-jdk/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; - platforms = with platforms; [ "x86_64-linux" ]; + platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; }; }; in drv diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 6e0716659c7..1e9b77cfb79 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: let - rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; + rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83"; in stdenv.mkDerivation { pname = "manticore"; - version = "2018.09.29"; + version = "2019.09.20"; src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; - sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn"; + sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz"; inherit rev; }; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 9a2f01b9f3d..e0cfe247b23 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix $out $configureFlags ''; - # Attempt to fix this error when running "mcs --version": - # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image - dontStrip = true; - # We want pkg-config to take priority over the dlls in the Mono framework and the GAC # because we control pkg-config patches = [ ./pkgconfig-before-gac.patch ]; diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix new file mode 100644 index 00000000000..97634bca8ef --- /dev/null +++ b/pkgs/development/compilers/mozart/default.nix @@ -0,0 +1,89 @@ +{ lib +, fetchFromGitHub +, fetchurl +, cmake +, unzip +, makeWrapper +, boost +, llvmPackages +, llvmPackages_4 +, gmp +, emacs +, emacs25-nox +, jre_headless +, tcl +, tk +}: + +let stdenv = llvmPackages.stdenv; + +in stdenv.mkDerivation rec { + pname = "mozart2"; + version = "2.0.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip"; + sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll"; + }; + + # This is a workaround to avoid using sbt. + # I guess it is acceptable to fetch the bootstrapping compiler in binary form. + bootcompiler = fetchurl { + url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar"; + sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz"; + }; + + postConfigure = '' + cp ${bootcompiler} bootcompiler/bootcompiler.jar + ''; + + nativeBuildInputs = [ cmake makeWrapper unzip ]; + + # We cannot compile with both gcc and clang, but we need clang during the + # process, so we compile everything with clang. + # BUT, we need clang4 for parsing, and a more recent clang for compiling. + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++" + "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" + "-DBoost_USE_STATIC_LIBS=OFF" + "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" + "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin" + # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to + # infer that it is not a linking call, and stop trashing the command line + # with linker flags. + # As it does not recognise -emit-ast, we pass -c immediately overridden + # by -emit-ast. + # The remaining is just the default flags that we cannot reuse and need + # to repeat here. + "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'" + # We are building with clang, as nix does not support having clang and + # gcc together as compilers and we need clang for the sources generation. + # However, clang emits tons of warnings about gcc's atomic-base library. + "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init" + ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST"; + + fixupPhase = '' + wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs + ''; + + buildInputs = [ + boost + llvmPackages_4.llvm + llvmPackages_4.clang + llvmPackages_4.clang-unwrapped + gmp + emacs25-nox + jre_headless + tcl + tk + ]; + + meta = { + description = "An open source implementation of Oz 3."; + maintainers = [ lib.maintainers.layus ]; + license = lib.licenses.bsd2; + homepage = "https://mozart.github.io"; + }; + +} diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 1d356945a4f..1a5848cd1a6 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -219,6 +219,8 @@ let ln -s $jre/lib/openjdk/jre $out/jre ''; + propagatedBuildInputs = [ setJavaClassPath ]; + preFixup = '' # Propagate the setJavaClassPath setup hook from the JRE so that # any package that depends on the JRE has $CLASSPATH set up diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 0e4207dccac..9e11daced4a 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.9"; + name = "scala-2.12.10"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; + sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index ab27d93a7cf..6bba11af9d4 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.0"; + name = "scala-2.13.1"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p"; + sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index dea6df1b7aa..63557d61019 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }: +{ stdenv, fetchurl, fetchFromGitHub +, llvmPackages, ncurses, lua +}: let luajitArchive = "LuaJIT-2.0.5.tar.gz"; luajitSrc = fetchurl { - url = "http://luajit.org/download/${luajitArchive}"; + url = "http://luajit.org/download/${luajitArchive}"; sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; }; in - stdenv.mkDerivation rec { - pname = "terra-git"; - version = "1.0.0-beta1"; + pname = "terra"; + version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { - owner = "zdevito"; - repo = "terra"; - rev = "release-${version}"; - sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c"; + owner = "zdevito"; + repo = "terra"; + rev = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d"; + sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s"; }; + nativeBuildInputs = [ lua ]; + buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ]; + + doCheck = true; + enableParallelBuilding = true; + hardeningDisable = [ "fortify" ]; outputs = [ "bin" "dev" "out" "static" ]; + patches = [ ./nix-cflags.patch ]; postPatch = '' - substituteInPlace Makefile --replace \ - '-lcurses' '-lncurses' + substituteInPlace Makefile \ + --replace '-lcurses' '-lncurses' + + substituteInPlace src/terralib.lua \ + --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include ''; preBuild = '' @@ -36,6 +47,8 @@ stdenv.mkDerivation rec { cp ${luajitSrc} build/${luajitArchive} ''; + checkPhase = "(cd tests && ../terra run)"; + installPhase = '' install -Dm755 -t $bin/bin release/bin/terra install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} @@ -45,13 +58,11 @@ stdenv.mkDerivation rec { cp -rv release/include/terra $dev/include ''; - buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; - meta = with stdenv.lib; { description = "A low-level counterpart to Lua"; - homepage = http://terralang.org/; - platforms = platforms.x86_64; - maintainers = with maintainers; [ jb55 ]; - license = licenses.mit; + homepage = http://terralang.org/; + platforms = platforms.x86_64; + maintainers = with maintainers; [ jb55 thoughtpolice ]; + license = licenses.mit; }; } diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/pkgs/development/compilers/terra/nix-cflags.patch new file mode 100644 index 00000000000..339ae23cef6 --- /dev/null +++ b/pkgs/development/compilers/terra/nix-cflags.patch @@ -0,0 +1,22 @@ +diff --git a/src/terralib.lua b/src/terralib.lua +index 351238d..e638c90 100644 +--- a/src/terralib.lua ++++ b/src/terralib.lua +@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target) + args:insert("-internal-isystem") + args:insert(path) + end ++ ++ -- NOTE(aseipp): include relevant Nix header files ++ args:insert("-isystem") ++ args:insert("@NIX_LIBC_INCLUDE@") ++ ++ local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE') ++ if nix_cflags ~= nil then ++ for w in nix_cflags:gmatch("%S+") do ++ args:insert(w) ++ end ++ end + + if cargs then + args:insertall(cargs) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4cca42309d..fd8bfef030a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn"; + sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -146,16 +146,11 @@ self: super: { else super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = appendPatch - (if pkgs.stdenv.isDarwin + hakyll = if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else super.hakyll) - (pkgs.fetchpatch { - url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch; - sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ="; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion @@ -1197,8 +1192,8 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; }; - dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; }; + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; }; # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 @@ -1228,4 +1223,13 @@ self: super: { ''; }); + # The LTS-14.x version of optparse-applicative is too old. + cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + + # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b + amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch; + + # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b + amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 69bd3844c9c..a233185cf4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -70,11 +70,10 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; - vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch { + vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch"; sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19"; }); - cabal-doctest = super.cabal-doctest_1_0_7; regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; @@ -85,10 +84,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; }); - haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch"; - sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3"; - }); optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; @@ -97,39 +92,22 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); - happy = appendPatch super.happy (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch"; - sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk"; - }); - hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch"; - sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i"; + hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch"; + sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw"; }); - easytest = self.easytest_0_3; + easytest = markBroken super.easytest; + easytest_0_3 = markBroken super.easytest_0_3; regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch"; - sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl"; - }); - cassava = appendPatch super.cassava (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; - sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; - }); - shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; - sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; - }); - socks = appendPatch super.socks (pkgs.fetchpatch { + socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); - lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch"; - sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1"; - }); + lens = self.lens_4_18_1; + xmonad-contrib = self.xmonad-contrib_0_16; polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; @@ -159,14 +137,48 @@ self: super: { ''; }); system-fileio = doJailbreak super.system-fileio; - yaml = self.yaml_0_11_1_2; + tasty-hedgehog = doJailbreak super.tasty-hedgehog; haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch"; - sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc"; + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch"; + sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8"; }); asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; }); tls = self.tls_1_5_1; + vault = dontHaddock super.vault; + monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 + + # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved + alex = appendPatch super.alex (pkgs.fetchpatch { + url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; + sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; + }); + + # don't use obsolete "defaultUserHooks" in Setup.hs + X11 = appendPatch super.X11 (pkgs.fetchpatch { + url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch"; + sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b"; + }); + + # over-specified version constraints + aeson-diff = doJailbreak super.aeson-diff; + + # https://github.com/sol/hpack/issues/371 + hpack = markBrokenVersion "0.32.0" super.hpack; + + # Upstream ships a broken Setup.hs file. + csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); + + # Upstream ships a broken Setup.hs file. + string-qq = overrideSrc (dontCheck super.string-qq) { + src = pkgs.fetchFromGitHub { + owner = "dmwit"; + repo = "string-qq"; + rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe"; + sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s"; + }; + }; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c0692d975df..68a05ff9411 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.5 + # LTS Haskell 14.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,7 +55,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aeson ==1.4.4.0 + - aeson ==1.4.5.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -98,7 +98,7 @@ default-package-overrides: - appendmap ==0.1.5 - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 - - approximate ==0.3.1 + - approximate ==0.3.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.0 - arithmoi ==0.9.0.0 @@ -356,7 +356,7 @@ default-package-overrides: - comonad ==5.0.5 - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - - compensated ==0.7.2 + - compensated ==0.7.3 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 @@ -509,7 +509,7 @@ default-package-overrides: - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.4.2.3 + - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.7 - derulo ==1.0.5 @@ -623,7 +623,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.3.0 + - eventstore ==1.3.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 @@ -775,7 +775,7 @@ default-package-overrides: - ghc-lib-parser ==8.8.0.20190424 - ghc-parser ==0.2.0.3 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.5 + - ghc-prof ==1.4.1.6 - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3.1 @@ -806,7 +806,7 @@ default-package-overrides: - glabrous ==2.0.0 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - - GLFW-b ==3.2.1.0 + - GLFW-b ==3.2.1.1 - Glob ==0.10.0 - gloss ==1.13.0.1 - gloss-algorithms ==1.13.0.1 @@ -863,8 +863,8 @@ default-package-overrides: - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.15.0.1 - - haskell-lsp-types ==0.15.0.1 + - haskell-lsp ==0.15.0.0 + - haskell-lsp-types ==0.15.0.0 - haskell-names ==0.9.6 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 @@ -967,7 +967,7 @@ default-package-overrides: - hslua-aeson ==1.0.0 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.16 + - HsOpenSSL ==0.11.4.17 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.7.1 @@ -1063,7 +1063,7 @@ default-package-overrides: - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyper ==0.1.0.3 - - hyperloglog ==0.4.2 + - hyperloglog ==0.4.3 - hyphenation ==0.8 - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 @@ -1086,7 +1086,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.7.1 + - influxdb ==1.7.1.1 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.7.0.1 @@ -1201,7 +1201,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.4 - lens ==4.17.1 - - lens-action ==0.2.3 + - lens-action ==0.2.4 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - lens-family ==1.2.3 @@ -1277,10 +1277,10 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.4.1.0 - - massiv-io ==0.1.6.0 + - massiv-io ==0.1.7.0 - massiv-test ==0.1.0 - mathexpr ==0.3.0.0 - - math-functions ==0.3.2.0 + - math-functions ==0.3.2.1 - matplotlib ==0.7.4 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1329,7 +1329,6 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - mixed-types-num ==0.4.0.1 - - mixpanel-client ==0.2.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.1 @@ -1425,7 +1424,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.1.1.0 + - network-byte-order ==0.1.1.1 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 @@ -1437,8 +1436,8 @@ default-package-overrides: - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - - newtype ==0.2.1.0 - - newtype-generics ==0.5.3 + - newtype ==0.2.2.0 + - newtype-generics ==0.5.4 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 @@ -1480,7 +1479,7 @@ default-package-overrides: - OneTuple ==0.2.2 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7004.0 + - opaleye ==0.6.7004.1 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1663,7 +1662,7 @@ default-package-overrides: - protocol-buffers ==2.4.12 - protocol-buffers-descriptor ==2.4.12 - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.1.0.0 + - protocol-radius-test ==0.1.0.1 - proto-lens ==0.5.1.0 - proto-lens-arbitrary ==0.1.2.7 - proto-lens-optparse ==0.1.1.5 @@ -1679,8 +1678,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.6 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.9 - - PyF ==0.8.1.0 + - pusher-http-haskell ==1.5.1.10 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.5 @@ -1733,7 +1731,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.1.0 + - reanimate-svg ==0.9.1.1 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1769,6 +1767,8 @@ default-package-overrides: - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 + - replace-attoparsec ==1.0.1.0 + - replace-megaparsec ==1.1.3.0 - repline ==0.2.1.0 - req ==2.1.0 - req-conduit ==1.0.0 @@ -1883,7 +1883,7 @@ default-package-overrides: - servant-pipes ==0.15 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.2.0 + - servant-static-th ==0.2.2.1 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.22.2 - servant-swagger-ui-core ==0.3.3 @@ -1921,7 +1921,7 @@ default-package-overrides: - simple ==0.11.3 - simple-cabal ==0.0.0.1 - simple-cmd ==0.2.0.1 - - simple-cmd-args ==0.1.2 + - simple-cmd-args ==0.1.3 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -2011,7 +2011,7 @@ default-package-overrides: - strict ==0.3.2 - strict-base-types ==0.6.1 - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.4 + - strict-list ==0.1.5 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -2180,7 +2180,7 @@ default-package-overrides: - tonatona-servant ==0.1.0.2 - torsor ==0.1 - tostring ==0.2.1.1 - - TotalMap ==0.1.0.0 + - TotalMap ==0.1.1.1 - tracing ==0.0.4.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 @@ -2245,11 +2245,11 @@ default-package-overrides: - unique-logic ==0.4 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - - universe ==1.1 + - universe ==1.1.1 - universe-base ==1.1.1 - universe-dependent-sum ==1.1.0.1 - universe-instances-base ==1.1 - - universe-instances-extended ==1.1 + - universe-instances-extended ==1.1.1 - universe-instances-trans ==1.1 - universe-reverse-instances ==1.1 - universum ==1.5.0 @@ -2309,7 +2309,7 @@ default-package-overrides: - verbosity ==0.3.0.0 - versions ==3.5.1.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.29 + - viewprof ==0.0.0.30 - vinyl ==0.11.0 - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 @@ -2339,7 +2339,7 @@ default-package-overrides: - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - warp ==3.2.28 - - warp-tls ==3.2.7 + - warp-tls ==3.2.8 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2435,7 +2435,7 @@ default-package-overrides: - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.6 + - yesod-form ==1.6.7 - yesod-form-bootstrap4 ==2.1.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 @@ -2871,146 +2871,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka - - amazonka-alexa-business - - amazonka-apigateway - - amazonka-application-autoscaling - - amazonka-appstream - - amazonka-appsync - - amazonka-athena - - amazonka-autoscaling - - amazonka-autoscaling-plans - - amazonka-batch - - amazonka-budgets - - amazonka-certificatemanager - - amazonka-certificatemanager-pca - - amazonka-cloud9 - - amazonka-clouddirectory - - amazonka-cloudformation - - amazonka-cloudfront - - amazonka-cloudhsm - - amazonka-cloudhsmv2 - - amazonka-cloudsearch - - amazonka-cloudsearch-domains - - amazonka-cloudtrail - - amazonka-cloudwatch - - amazonka-cloudwatch-events - - amazonka-cloudwatch-logs - - amazonka-codebuild - - amazonka-codecommit - - amazonka-codedeploy - - amazonka-codepipeline - - amazonka-codestar - - amazonka-cognito-identity - - amazonka-cognito-idp - - amazonka-cognito-sync - - amazonka-comprehend - - amazonka-config - - amazonka-connect - - amazonka-core - - amazonka-cost-explorer - - amazonka-cur - - amazonka-datapipeline - - amazonka-devicefarm - - amazonka-directconnect - - amazonka-discovery - - amazonka-dms - - amazonka-ds - - amazonka-dynamodb - - amazonka-dynamodb-dax - - amazonka-dynamodb-streams - - amazonka-ec2 - - amazonka-ecr - - amazonka-ecs - - amazonka-efs - - amazonka-elasticache - - amazonka-elasticbeanstalk - - amazonka-elasticsearch - - amazonka-elastictranscoder - - amazonka-elb - - amazonka-elbv2 - - amazonka-emr - - amazonka-fms - - amazonka-gamelift - - amazonka-glacier - - amazonka-glue - - amazonka-greengrass - - amazonka-guardduty - - amazonka-health - - amazonka-iam - - amazonka-importexport - - amazonka-inspector - - amazonka-iot - - amazonka-iot-analytics - - amazonka-iot-dataplane - - amazonka-iot-jobs-dataplane - - amazonka-kinesis - - amazonka-kinesis-analytics - - amazonka-kinesis-firehose - - amazonka-kinesis-video - - amazonka-kinesis-video-archived-media - - amazonka-kinesis-video-media - - amazonka-kms - - amazonka-lambda - - amazonka-lex-models - - amazonka-lex-runtime - - amazonka-lightsail - - amazonka-marketplace-analytics - - amazonka-marketplace-entitlement - - amazonka-marketplace-metering - - amazonka-mechanicalturk - - amazonka-mediaconvert - - amazonka-medialive - - amazonka-mediapackage - - amazonka-mediastore - - amazonka-mediastore-dataplane - - amazonka-migrationhub - - amazonka-ml - - amazonka-mobile - - amazonka-mq - - amazonka-opsworks - - amazonka-opsworks-cm - - amazonka-organizations - - amazonka-pinpoint - - amazonka-polly - - amazonka-pricing - - amazonka-rds - - amazonka-redshift - - amazonka-rekognition - - amazonka-resourcegroups - - amazonka-resourcegroupstagging - - amazonka-route53 - - amazonka-route53-autonaming - - amazonka-route53-domains - - amazonka-s3 - - amazonka-s3-streaming - - amazonka-sagemaker - - amazonka-sagemaker-runtime - - amazonka-sdb - - amazonka-secretsmanager - - amazonka-serverlessrepo - - amazonka-servicecatalog - - amazonka-ses - - amazonka-shield - - amazonka-sms - - amazonka-snowball - - amazonka-sns - - amazonka-sqs - - amazonka-ssm - - amazonka-stepfunctions - - amazonka-storagegateway - - amazonka-sts - - amazonka-support - - amazonka-swf - - amazonka-test - - amazonka-transcribe - - amazonka-translate - - amazonka-waf - - amazonka-waf-regional - - amazonka-workdocs - - amazonka-workmail - - amazonka-workspaces - - amazonka-xray - amby - AMI - ampersand @@ -3050,6 +2910,7 @@ broken-packages: - antiope-messages - antiope-optparse-applicative - antiope-s3 + - antiope-shell - antiope-sns - antiope-sqs - antiope-swf @@ -3116,6 +2977,7 @@ broken-packages: - armor - arpa - arpack + - array-builder - array-chunks - array-forth - array-primops @@ -3210,7 +3072,6 @@ broken-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams - - aws-easy - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder @@ -3226,7 +3087,6 @@ broken-packages: - aws-sdk - aws-sdk-text-converter - aws-sdk-xml-unordered - - aws-ses-easy - aws-sign4 - aws-simple - aws-sns @@ -3932,7 +3792,6 @@ broken-packages: - conduit-throttle - conduit-tokenize-attoparsec - conf - - confcrypt - conffmt - confide - config-parser @@ -4502,7 +4361,6 @@ broken-packages: - easyplot - ebeats - ebnf-bff - - ec2-unikernel - ecma262 - ecu - eddie @@ -4529,7 +4387,6 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-list-functions - EitherT - - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - ekg-influxdb @@ -4741,6 +4598,11 @@ broken-packages: - feed-translator - feed2lj - feed2twitter + - fei-base + - fei-cocoapi + - fei-dataiter + - fei-examples + - fei-nn - feldspar-compiler - feldspar-language - fenfire @@ -4786,6 +4648,7 @@ broken-packages: - findhttp - fingertree-psqueue - fingertree-tf + - finitary-derive - FiniteMap - firefly-example - first-and-last @@ -5087,6 +4950,7 @@ broken-packages: - ghci-history-parser - ghci-lib - ghci-ng + - ghcide - ghcjs-base-stub - ghcjs-dom-jsffi - ghcjs-fetch @@ -5373,7 +5237,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5709,6 +5572,7 @@ broken-packages: - hdbi-tests - hdf - hDFA + - hdiff - hdigest - hdirect - hdis86 @@ -5723,7 +5587,6 @@ broken-packages: - heartbeat-streams - heatitup - heatitup-complete - - heavy-logger-amazon - hecc - heckle - hedgehog-checkers @@ -6376,6 +6239,7 @@ broken-packages: - ide-backend-server - ideas - ideas-math + - ideas-math-types - idempotent - identifiers - idiii @@ -7150,9 +7014,6 @@ broken-packages: - marxup - masakazu-bot - MASMGen - - massiv - - massiv-io - - massiv-test - master-plan - matchable-th - matchers @@ -7964,7 +7825,6 @@ broken-packages: - pier-core - piet - pig - - pinboard-notes-backup - pinchot - ping - pinpon @@ -8691,7 +8551,6 @@ broken-packages: - scenegraph - schedevr - schedule-planner - - scheduler - schedyield - schematic - scholdoc @@ -8752,6 +8611,7 @@ broken-packages: - selenium - selenium-server - selinux + - semantic-source - Semantique - semdoc - semi-iso @@ -8842,7 +8702,6 @@ broken-packages: - servant-zeppelin-server - servant-zeppelin-swagger - server-generic - - serverless-haskell - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod @@ -8899,8 +8758,6 @@ broken-packages: - shellish - shellmate - shellmate-extras - - shh - - shh-extras - shivers-cfg - shoap - shopify @@ -9565,6 +9422,7 @@ broken-packages: - through-text - throwable-exceptions - thumbnail-plus + - thumbnail-polish - tic-tac-toe - tickle - TicTacToe diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 88ec8ad85ff..5db25686fc6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super { snap-server = dontCheck super.snap-server; # Tests require internet - dhall_1_25_0 = dontCheck super.dhall_1_25_0; + dhall_1_26_0 = dontCheck super.dhall_1_26_0; http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3b91b02ffad..d1217ea37df 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4407,6 +4407,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Diff_0_4_0" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.4.0"; + sha256 = "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DifferenceLogic" = callPackage ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }: mkDerivation { @@ -6440,10 +6458,8 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "3.2.1.0"; - sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; - revision = "2"; - editedCabalFile = "0xlby7483dv33c13f44kkvmai186g72jhxmcq8749s1hyxi6fqnb"; + version = "3.2.1.1"; + sha256 = "1rjfdbx4pv7knlm4g8rh90jndc2a8zjmrdmfm2wvwna08h385g5g"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -9087,6 +9103,8 @@ self: { pname = "HStringTemplate"; version = "0.8.7"; sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg"; + revision = "1"; + editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -10514,10 +10532,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.16"; - sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; - revision = "2"; - editedCabalFile = "1cg28q793cg4w8c574yzzfxcn1r8595vs77mlrkw68j8hzgs6lj3"; + version = "0.11.4.17"; + sha256 = "0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -10621,6 +10637,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.0.0"; + sha256 = "1x8zrnaqvfkap4q2gldj0y4q63kbjka8383s5k4mb0ka1n3dfqhq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector }: @@ -10764,8 +10802,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.0.2"; - sha256 = "0f9pl46m05izxhychf7j8pd9rfx8bqw13735xvq602iyszng8pa4"; + version = "0.0.3"; + sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -12715,8 +12753,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.1.0"; - sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1"; + version = "0.1.2.0"; + sha256 = "1fvs9im82ylfij01cn2pb21wycvb6wsj8dayaj34g3av82g9dagw"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -19159,8 +19197,8 @@ self: { }: mkDerivation { pname = "TotalMap"; - version = "0.1.0.0"; - sha256 = "0k495j5akabp93zq3jm6vi1y1pz1dmvysbxxp0x4fj28yj7svs3d"; + version = "0.1.1.1"; + sha256 = "1415xyh354i7d5y7c2g2k1gyd3knkdx97gxa1z8bjn9ah5qvd8mw"; libraryHaskellDepends = [ adjunctions base distributive generics-sop lens ]; @@ -20202,8 +20240,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.4"; - sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2"; + version = "0.2.2.5"; + sha256 = "08gbvlsf37nx982qs19pb9qc5sxi6493f02d3afjsyxqvalfbijy"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -21144,6 +21182,18 @@ self: { broken = true; }) {}; + "abides" = callPackage + ({ mkDerivation, base, comonad, tasty, tasty-quickcheck }: + mkDerivation { + pname = "abides"; + version = "0.0.0"; + sha256 = "0bksprm776xqxvizmwxaq996kvwj4gvd4ckwalr72aa2082vzs17"; + libraryHaskellDepends = [ base comonad ]; + testHaskellDepends = [ base comonad tasty tasty-quickcheck ]; + description = "Simple boolean tests to see if a value abides by certain properties"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "abnf" = callPackage ({ mkDerivation, attoparsec, base, containers, HUnit, megaparsec , tasty, tasty-hunit, test-framework, test-framework-hunit, text @@ -21801,12 +21851,15 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.15.0"; - sha256 = "0x1w7da9bcr23v97zri9bz5iw3hzy1x55b4i2di1cswnp50qxz60"; + version = "0.15.1"; + sha256 = "0dhzi1f951q2csi8rk393rg81jpd8w9vxwlmg638dknh4i35zg35"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring cereal containers directory filelock filepath mtl network safecopy stm template-haskell th-expand-syns unix ]; + executableHaskellDepends = [ base directory ]; testHaskellDepends = [ base cereal containers deepseq directory hedgehog hspec hspec-discover mtl network safecopy template-haskell text time @@ -22981,40 +23034,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.4.0"; - sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp"; - revision = "1"; - editedCabalFile = "1mn7ws8v5zsm9fy9ndvb0rygchjbwnnxyyxpl63cf9lmzzffvxd6"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.4.5.0"; sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"; libraryHaskellDepends = [ @@ -23033,7 +23052,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23439,6 +23457,25 @@ self: { broken = true; }) {}; + "aeson-optics" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , optics-core, optics-extra, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-optics"; + version = "1.1"; + sha256 = "0cyhlhks1zq1h7f49qi1xk094j7zhqfz8p0dpyg18qghppzhlyd8"; + revision = "1"; + editedCabalFile = "1ql2zqjcwy744qzydj3gk4qgnj4nzba6j2d5fvi31i5va7vqad2d"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring optics-core + optics-extra scientific text unordered-containers vector + ]; + description = "Law-abiding optics for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-options" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -23611,6 +23648,28 @@ self: { broken = true; }) {}; + "aeson-schemas" = callPackage + ({ mkDerivation, aeson, base, bytestring, first-class-families + , megaparsec, raw-strings-qq, tasty, tasty-golden, template-haskell + , text, th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.0.2"; + sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl"; + libraryHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + raw-strings-qq tasty tasty-golden template-haskell text + th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -25307,8 +25366,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-alexa-business" = callPackage @@ -25326,8 +25383,6 @@ self: { ]; description = "Amazon Alexa For Business SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-apigateway" = callPackage @@ -25345,8 +25400,6 @@ self: { ]; description = "Amazon API Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-application-autoscaling" = callPackage @@ -25364,8 +25417,6 @@ self: { ]; description = "Amazon Application Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-appstream" = callPackage @@ -25383,8 +25434,6 @@ self: { ]; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-appsync" = callPackage @@ -25402,8 +25451,6 @@ self: { ]; description = "Amazon AppSync SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-athena" = callPackage @@ -25421,8 +25468,6 @@ self: { ]; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-autoscaling" = callPackage @@ -25440,8 +25485,6 @@ self: { ]; description = "Amazon Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-autoscaling-plans" = callPackage @@ -25459,8 +25502,6 @@ self: { ]; description = "Amazon Auto Scaling Plans SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-batch" = callPackage @@ -25478,8 +25519,6 @@ self: { ]; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-budgets" = callPackage @@ -25497,8 +25536,6 @@ self: { ]; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-certificatemanager" = callPackage @@ -25516,8 +25553,6 @@ self: { ]; description = "Amazon Certificate Manager SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-certificatemanager-pca" = callPackage @@ -25535,8 +25570,6 @@ self: { ]; description = "Amazon Certificate Manager Private Certificate Authority SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloud9" = callPackage @@ -25554,8 +25587,6 @@ self: { ]; description = "Amazon Cloud9 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-clouddirectory" = callPackage @@ -25573,8 +25604,6 @@ self: { ]; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudformation" = callPackage @@ -25592,8 +25621,6 @@ self: { ]; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudfront" = callPackage @@ -25611,8 +25638,6 @@ self: { ]; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudhsm" = callPackage @@ -25630,8 +25655,6 @@ self: { ]; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -25649,8 +25672,6 @@ self: { ]; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudsearch" = callPackage @@ -25668,8 +25689,6 @@ self: { ]; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -25687,8 +25706,6 @@ self: { ]; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudtrail" = callPackage @@ -25706,8 +25723,6 @@ self: { ]; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch" = callPackage @@ -25725,8 +25740,6 @@ self: { ]; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -25744,8 +25757,6 @@ self: { ]; description = "Amazon CloudWatch Events SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -25763,8 +25774,6 @@ self: { ]; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codebuild" = callPackage @@ -25782,8 +25791,6 @@ self: { ]; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codecommit" = callPackage @@ -25801,8 +25808,6 @@ self: { ]; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codedeploy" = callPackage @@ -25820,8 +25825,6 @@ self: { ]; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codepipeline" = callPackage @@ -25839,8 +25842,6 @@ self: { ]; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codestar" = callPackage @@ -25858,8 +25859,6 @@ self: { ]; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-identity" = callPackage @@ -25877,8 +25876,6 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -25896,8 +25893,6 @@ self: { ]; description = "Amazon Cognito Identity Provider SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-sync" = callPackage @@ -25915,8 +25910,6 @@ self: { ]; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-comprehend" = callPackage @@ -25934,8 +25927,6 @@ self: { ]; description = "Amazon Comprehend SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-config" = callPackage @@ -25953,8 +25944,6 @@ self: { ]; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-connect" = callPackage @@ -25972,8 +25961,6 @@ self: { ]; description = "Amazon Connect Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-core" = callPackage @@ -26004,8 +25991,6 @@ self: { ]; description = "Core data types and functionality for Amazonka libraries"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cost-explorer" = callPackage @@ -26023,8 +26008,6 @@ self: { ]; description = "Amazon Cost Explorer Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cur" = callPackage @@ -26042,8 +26025,6 @@ self: { ]; description = "Amazon Cost and Usage Report Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-datapipeline" = callPackage @@ -26061,8 +26042,6 @@ self: { ]; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-devicefarm" = callPackage @@ -26080,8 +26059,6 @@ self: { ]; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-directconnect" = callPackage @@ -26099,8 +26076,6 @@ self: { ]; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-discovery" = callPackage @@ -26118,8 +26093,6 @@ self: { ]; description = "Amazon Application Discovery Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dms" = callPackage @@ -26137,8 +26110,6 @@ self: { ]; description = "Amazon Database Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ds" = callPackage @@ -26156,8 +26127,6 @@ self: { ]; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb" = callPackage @@ -26175,8 +26144,6 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -26194,8 +26161,6 @@ self: { ]; description = "Amazon DynamoDB Accelerator (DAX) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -26213,8 +26178,6 @@ self: { ]; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ec2" = callPackage @@ -26232,8 +26195,6 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ecr" = callPackage @@ -26251,8 +26212,6 @@ self: { ]; description = "Amazon EC2 Container Registry SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ecs" = callPackage @@ -26270,8 +26229,6 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-efs" = callPackage @@ -26289,8 +26246,6 @@ self: { ]; description = "Amazon Elastic File System SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticache" = callPackage @@ -26308,8 +26263,6 @@ self: { ]; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -26327,8 +26280,6 @@ self: { ]; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticsearch" = callPackage @@ -26346,8 +26297,6 @@ self: { ]; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elastictranscoder" = callPackage @@ -26365,8 +26314,6 @@ self: { ]; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elb" = callPackage @@ -26384,8 +26331,6 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elbv2" = callPackage @@ -26403,8 +26348,6 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-emr" = callPackage @@ -26422,8 +26365,6 @@ self: { ]; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-fms" = callPackage @@ -26441,8 +26382,6 @@ self: { ]; description = "Amazon Firewall Management Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-gamelift" = callPackage @@ -26460,8 +26399,6 @@ self: { ]; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-glacier" = callPackage @@ -26479,8 +26416,6 @@ self: { ]; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-glue" = callPackage @@ -26498,8 +26433,6 @@ self: { ]; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-greengrass" = callPackage @@ -26517,8 +26450,6 @@ self: { ]; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-guardduty" = callPackage @@ -26536,8 +26467,6 @@ self: { ]; description = "Amazon GuardDuty SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-health" = callPackage @@ -26555,8 +26484,6 @@ self: { ]; description = "Amazon Health APIs and Notifications SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iam" = callPackage @@ -26574,8 +26501,6 @@ self: { ]; description = "Amazon Identity and Access Management SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iam-policy" = callPackage @@ -26614,8 +26539,6 @@ self: { ]; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-inspector" = callPackage @@ -26633,8 +26556,6 @@ self: { ]; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot" = callPackage @@ -26652,8 +26573,6 @@ self: { ]; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-analytics" = callPackage @@ -26671,8 +26590,6 @@ self: { ]; description = "Amazon IoT Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-dataplane" = callPackage @@ -26690,8 +26607,6 @@ self: { ]; description = "Amazon IoT Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-jobs-dataplane" = callPackage @@ -26709,8 +26624,6 @@ self: { ]; description = "Amazon IoT Jobs Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis" = callPackage @@ -26728,8 +26641,6 @@ self: { ]; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -26747,8 +26658,6 @@ self: { ]; description = "Amazon Kinesis Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -26766,8 +26675,6 @@ self: { ]; description = "Amazon Kinesis Firehose SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video" = callPackage @@ -26785,8 +26692,6 @@ self: { ]; description = "Amazon Kinesis Video Streams SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video-archived-media" = callPackage @@ -26804,8 +26709,6 @@ self: { ]; description = "Amazon Kinesis Video Streams Archived Media SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video-media" = callPackage @@ -26823,8 +26726,6 @@ self: { ]; description = "Amazon Kinesis Video Streams Media SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kms" = callPackage @@ -26842,8 +26743,6 @@ self: { ]; description = "Amazon Key Management Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lambda" = callPackage @@ -26861,8 +26760,6 @@ self: { ]; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lex-models" = callPackage @@ -26880,8 +26777,6 @@ self: { ]; description = "Amazon Lex Model Building Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lex-runtime" = callPackage @@ -26899,8 +26794,6 @@ self: { ]; description = "Amazon Lex Runtime Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lightsail" = callPackage @@ -26918,8 +26811,6 @@ self: { ]; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -26937,8 +26828,6 @@ self: { ]; description = "Amazon Marketplace Commerce Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -26956,8 +26845,6 @@ self: { ]; description = "Amazon Marketplace Entitlement Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-metering" = callPackage @@ -26975,8 +26862,6 @@ self: { ]; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26994,8 +26879,6 @@ self: { ]; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediaconvert" = callPackage @@ -27013,8 +26896,6 @@ self: { ]; description = "Amazon Elemental MediaConvert SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-medialive" = callPackage @@ -27032,8 +26913,6 @@ self: { ]; description = "Amazon Elemental MediaLive SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediapackage" = callPackage @@ -27051,8 +26930,6 @@ self: { ]; description = "Amazon Elemental MediaPackage SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediastore" = callPackage @@ -27070,8 +26947,6 @@ self: { ]; description = "Amazon Elemental MediaStore SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediastore-dataplane" = callPackage @@ -27089,8 +26964,6 @@ self: { ]; description = "Amazon Elemental MediaStore Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-migrationhub" = callPackage @@ -27108,8 +26981,6 @@ self: { ]; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ml" = callPackage @@ -27127,8 +26998,6 @@ self: { ]; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mobile" = callPackage @@ -27146,8 +27015,6 @@ self: { ]; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mq" = callPackage @@ -27165,8 +27032,6 @@ self: { ]; description = "Amazon MQ SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-opsworks" = callPackage @@ -27184,8 +27049,6 @@ self: { ]; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-opsworks-cm" = callPackage @@ -27203,8 +27066,6 @@ self: { ]; description = "Amazon OpsWorks for Chef Automate SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-organizations" = callPackage @@ -27222,8 +27083,6 @@ self: { ]; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-pinpoint" = callPackage @@ -27241,8 +27100,6 @@ self: { ]; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-polly" = callPackage @@ -27260,8 +27117,6 @@ self: { ]; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-pricing" = callPackage @@ -27279,8 +27134,6 @@ self: { ]; description = "Amazon Price List Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-rds" = callPackage @@ -27298,8 +27151,6 @@ self: { ]; description = "Amazon Relational Database Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-redshift" = callPackage @@ -27317,8 +27168,6 @@ self: { ]; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-rekognition" = callPackage @@ -27336,8 +27185,6 @@ self: { ]; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-resourcegroups" = callPackage @@ -27355,8 +27202,6 @@ self: { ]; description = "Amazon Resource Groups SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -27374,8 +27219,6 @@ self: { ]; description = "Amazon Resource Groups Tagging API SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53" = callPackage @@ -27393,8 +27236,6 @@ self: { ]; description = "Amazon Route 53 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53-autonaming" = callPackage @@ -27412,8 +27253,6 @@ self: { ]; description = "Amazon Route 53 Auto Naming SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53-domains" = callPackage @@ -27431,8 +27270,6 @@ self: { ]; description = "Amazon Route 53 Domains SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-s3" = callPackage @@ -27450,8 +27287,6 @@ self: { ]; description = "Amazon Simple Storage Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-s3-streaming" = callPackage @@ -27471,8 +27306,6 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -27490,8 +27323,6 @@ self: { ]; description = "Amazon SageMaker Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker-runtime" = callPackage @@ -27509,8 +27340,6 @@ self: { ]; description = "Amazon SageMaker Runtime SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sdb" = callPackage @@ -27528,8 +27357,6 @@ self: { ]; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-secretsmanager" = callPackage @@ -27547,8 +27374,6 @@ self: { ]; description = "Amazon Secrets Manager SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-serverlessrepo" = callPackage @@ -27566,8 +27391,6 @@ self: { ]; description = "Amazon ServerlessApplicationRepository SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-servicecatalog" = callPackage @@ -27585,8 +27408,6 @@ self: { ]; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ses" = callPackage @@ -27604,8 +27425,6 @@ self: { ]; description = "Amazon Simple Email Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-shield" = callPackage @@ -27623,8 +27442,6 @@ self: { ]; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sms" = callPackage @@ -27642,8 +27459,6 @@ self: { ]; description = "Amazon Server Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-snowball" = callPackage @@ -27661,8 +27476,6 @@ self: { ]; description = "Amazon Import/Export Snowball SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sns" = callPackage @@ -27680,8 +27493,6 @@ self: { ]; description = "Amazon Simple Notification Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sqs" = callPackage @@ -27699,8 +27510,6 @@ self: { ]; description = "Amazon Simple Queue Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ssm" = callPackage @@ -27718,8 +27527,6 @@ self: { ]; description = "Amazon Simple Systems Manager (SSM) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-stepfunctions" = callPackage @@ -27737,8 +27544,6 @@ self: { ]; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-storagegateway" = callPackage @@ -27756,8 +27561,6 @@ self: { ]; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sts" = callPackage @@ -27775,8 +27578,6 @@ self: { ]; description = "Amazon Security Token Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-support" = callPackage @@ -27794,8 +27595,6 @@ self: { ]; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-swf" = callPackage @@ -27813,8 +27612,6 @@ self: { ]; description = "Amazon Simple Workflow Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-test" = callPackage @@ -27836,8 +27633,6 @@ self: { ]; description = "Common functionality for Amazonka library test-suites"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-transcribe" = callPackage @@ -27855,8 +27650,6 @@ self: { ]; description = "Amazon Transcribe Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-translate" = callPackage @@ -27874,8 +27667,6 @@ self: { ]; description = "Amazon Translate SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-waf" = callPackage @@ -27893,8 +27684,6 @@ self: { ]; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-waf-regional" = callPackage @@ -27912,8 +27701,6 @@ self: { ]; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workdocs" = callPackage @@ -27931,8 +27718,6 @@ self: { ]; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workmail" = callPackage @@ -27950,8 +27735,6 @@ self: { ]; description = "Amazon WorkMail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workspaces" = callPackage @@ -27969,8 +27752,6 @@ self: { ]; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-xray" = callPackage @@ -27988,8 +27769,6 @@ self: { ]; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amby" = callPackage @@ -28107,15 +27886,15 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.6.0"; - sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80"; + version = "0.3.7.1"; + sha256 = "1z7jf7ai7r2rlnwylqs60pqcz0h4dxj4g372c919lcvinmql1yfx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class hinotify magic process text time tls unix x509-system ]; - description = "Generic Haskell AMQP Consumer"; + description = "Generic Haskell AMQP tools"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -28867,12 +28646,12 @@ self: { "antiope-athena" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base - , lens, resourcet, text, unliftio-core + , hspec-discover, lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.3.0"; - sha256 = "1ixrpfc1yrvzigv5mid12s9yill5x0yvr5xfzwl9plm9jpzjjvv9"; + version = "7.4.2"; + sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28881,6 +28660,7 @@ self: { amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28891,8 +28671,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.3.0"; - sha256 = "0alg9nfwgyrvwxi8syrarqhf8din9dayvvll2078zl82r1x8hmgb"; + version = "7.4.2"; + sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28905,13 +28685,13 @@ self: { "antiope-core" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec - , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet - , scientific, text, transformers, unliftio-core + , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens + , mtl, resourcet, scientific, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "7.3.0"; - sha256 = "0x2lz5ljxdd2d0fv3srn6v6az1dacb83n16fshnm27z9vgnzvfjc"; + version = "7.4.2"; + sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28923,6 +28703,7 @@ self: { hw-hspec-hedgehog lens mtl resourcet scientific text transformers unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28931,13 +28712,13 @@ self: { "antiope-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb - , antiope-core, base, generic-lens, lens, text, unliftio-core - , unordered-containers + , antiope-core, base, generic-lens, hspec-discover, lens, text + , unliftio-core, unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.3.0"; - sha256 = "04izlg44mz7xv529q2m6j47hcxfca1zrk1fl11rcixdfi3iwfmvf"; + version = "7.4.2"; + sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28946,6 +28727,7 @@ self: { amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28954,14 +28736,14 @@ self: { "antiope-messages" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring - , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens - , lens-aeson, monad-loops, network-uri, scientific, text + , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , lens, lens-aeson, monad-loops, network-uri, scientific, text , unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "7.3.0"; - sha256 = "13mm39hbwmlhg1qv61nv0rs6kvw784k2ynrfd9yi1zlr5zycgwlm"; + version = "7.4.2"; + sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28971,6 +28753,7 @@ self: { hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri scientific text unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28979,12 +28762,13 @@ self: { "antiope-optparse-applicative" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base - , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text + , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , optparse-applicative, text }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.3.0"; - sha256 = "1qgd4mb99vpjswxca6l10ghg3d63vlqj3wc87afdcddfwa50f1zr"; + version = "7.4.2"; + sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28992,6 +28776,7 @@ self: { aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29002,13 +28787,13 @@ self: { ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec - , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet - , text, time, unliftio-core + , hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl + , network-uri, resourcet, text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "7.3.0"; - sha256 = "03qkvaz95qfqrildz92qhrnrny4i00p2l89j5p7miwxbdfzy7ga9"; + version = "7.4.2"; + sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -29021,6 +28806,38 @@ self: { hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri resourcet text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "antiope-shell" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, antiope-messages, antiope-s3, attoparsec, base + , bytestring, conduit, conduit-extra, exceptions, generic-lens + , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog + , lens, mtl, network-uri, process, resourcet, text, time + , unliftio-core + }: + mkDerivation { + pname = "antiope-shell"; + version = "7.4.2"; + sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-messages antiope-s3 attoparsec base bytestring exceptions + generic-lens http-types lens mtl network-uri process resourcet text + time unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri + resourcet text time unliftio-core + ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29029,13 +28846,13 @@ self: { "antiope-sns" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog - , lens, text, time, unliftio-core + , bytestring, generic-lens, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.3.0"; - sha256 = "066ryids04k0sixn9yf0h70jfj55z2g2xkrpqhxnr54sk2jr4njy"; + version = "7.4.2"; + sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29045,6 +28862,7 @@ self: { generic-lens hedgehog hspec hw-hspec-hedgehog lens text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29054,14 +28872,14 @@ self: { "antiope-sqs" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec - , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl - , network-uri, split, text, time, unliftio-core + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops + , mtl, network-uri, split, text, time, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "7.3.0"; - sha256 = "1nhs4v0h0hqjv6ncfy1wpsdsxkbbb0gz45rhf8swm8h2zfv9rqxl"; + version = "7.4.2"; + sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29072,6 +28890,7 @@ self: { generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson monad-loops mtl network-uri text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29080,14 +28899,15 @@ self: { "antiope-swf" = callPackage ({ mkDerivation, amazonka-swf, base, hedgehog, hspec - , hw-hspec-hedgehog, lens, text + , hspec-discover, hw-hspec-hedgehog, lens, text }: mkDerivation { pname = "antiope-swf"; - version = "7.3.0"; - sha256 = "1jqhq0ifdv8dqsnqsyb814nqq987fvng04gg8sbz5cjds7nm1c0m"; + version = "7.4.2"; + sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -30250,8 +30070,8 @@ self: { }: mkDerivation { pname = "approximate"; - version = "0.3.1"; - sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq"; + version = "0.3.2"; + sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens @@ -31057,15 +30877,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "array-builder" = callPackage + ({ mkDerivation, array-chunks, base, primitive, run-st, tasty + , tasty-hunit + }: + mkDerivation { + pname = "array-builder"; + version = "0.1.0.0"; + sha256 = "0wh1x3hywb0jaqxa7kdh3x3w0mqa4dwq2wdc70fvgmlijm6pyqw9"; + libraryHaskellDepends = [ array-chunks base primitive run-st ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Builders for arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "array-chunks" = callPackage ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes - , tasty, tasty-hunit, tasty-quickcheck + , run-st, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "array-chunks"; - version = "0.1.0.0"; - sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.1.0"; + sha256 = "0lx33cyqv5b5iyxy4v18dxs1zb0j72kxnlckhcckjvncg8lyf413"; + libraryHaskellDepends = [ base primitive run-st ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck @@ -31961,6 +31797,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "astar-monad" = callPackage + ({ mkDerivation, base, hspec, lens, logict, mtl }: + mkDerivation { + pname = "astar-monad"; + version = "0.3.0.0"; + sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf"; + libraryHaskellDepends = [ base logict mtl ]; + testHaskellDepends = [ base hspec lens logict mtl ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "astrds" = callPackage ({ mkDerivation, base, containers, directory, MonadRandom, mtl , OpenGL, random, SDL, SDL-image, SDL-mixer, SDL-ttf, unix @@ -32652,12 +32499,13 @@ self: { , dependency, dhall, directory, file-embed, filemanip, filepath , http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, unix-compat + , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.18"; - sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr"; + version = "3.2.6.0"; + sha256 = "1jxs3rfv9nrigwnshanc90dm3nzimr7zmfln1la5nv098prdkakr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32666,7 +32514,7 @@ self: { composition-prelude containers dependency dhall directory file-embed filemanip filepath http-client http-client-tls lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext - tar text unix zip-archive zlib + tar text unix unix-compat zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -34089,8 +33937,6 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-ec2" = callPackage @@ -34516,8 +34362,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-sign4" = callPackage @@ -34590,35 +34434,52 @@ self: { }) {}; "axel" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , freer-simple, ghcid, haskell-src-exts, hedgehog, lens, lens-aeson - , optparse-applicative, parsec, process, regex-pcre, singletons - , split, strict, tasty, tasty-discover, tasty-golden - , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers - , typed-process, vector, yaml + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , directory, filepath, freer-simple, ghcid, hashable + , haskell-src-exts, hedgehog, hpack, lens, lens-aeson, megaparsec + , mono-traversable, optparse-applicative, polysemy, polysemy-plugin + , prettyprinter, process, profunctors, random, singletons, split + , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec + , tasty-hunit, template-haskell, text, time, transformers + , typed-process, uniplate, vector, yaml }: mkDerivation { pname = "axel"; - version = "0.0.9"; - sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f"; + version = "0.0.11"; + sha256 = "1qygq82v70lizbpxmvj1c81qhb9jrmzgi603g03wa41las0sfamy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers directory filepath freer-simple ghcid - haskell-src-exts lens lens-aeson optparse-applicative parsec - process regex-pcre singletons strict template-haskell text - typed-process vector yaml + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; + libraryToolDepends = [ hpack tasty-discover ]; executableHaskellDepends = [ - base containers freer-simple optparse-applicative + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; + executableToolDepends = [ hpack tasty-discover ]; testHaskellDepends = [ - base bytestring containers filepath freer-simple hedgehog lens - split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec - transformers + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; - testToolDepends = [ tasty-discover ]; + testToolDepends = [ hpack tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37806,8 +37667,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "1"; - editedCabalFile = "0sww1904gn3sxvj94ac8l1g50v0j3fgpfiynbpvg0yhqsbfazi3n"; + revision = "2"; + editedCabalFile = "0b4fafgwhrp4i7vxcynzk5678kn6jvraanmbmf14mxlkipl2fff3"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -38014,6 +37875,8 @@ self: { pname = "binary-tagged"; version = "0.2"; sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; + revision = "1"; + editedCabalFile = "0chv885zl8m7c6281sz8kfr2p7hgcl7xj0yjajjyr9whwfnylfj0"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers cryptohash-sha1 generics-sop hashable scientific tagged text time @@ -38224,6 +38087,32 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; + "bindings-GLFW_3_3_0_0" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.3.0.0"; + sha256 = "0ns5dhww9s4sbss57jlys9wmjik2i0xa1b4g6i0k15r7mhrnanx7"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -39017,6 +38906,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binsm" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring + , optparse-applicative, parsec + }: + mkDerivation { + pname = "binsm"; + version = "0.1.1"; + sha256 = "1wiqslvf21xm15rf161lzffk5zzivbxs9sa9v7d257cx4d9qvy15"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring optparse-applicative parsec + ]; + description = "binary files splitter and merger"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup @@ -42334,7 +42241,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_49" = callPackage + "brick_0_50" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, filepath , microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -42343,8 +42250,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.49"; - sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd"; + version = "0.50"; + sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43209,8 +43116,8 @@ self: { ({ mkDerivation, base, mtl, multiset, random, template-haskell }: mkDerivation { pname = "buffon-machines"; - version = "1.1.1.0"; - sha256 = "0985xh66j3f8p352gsq9balndwrsnylqilnnbk2sfb535jyh84dh"; + version = "1.1.1.1"; + sha256 = "19qidzwg6mq8g2czzfqky7kh13jscsxc52ymfj8wlkngkciwvv5s"; libraryHaskellDepends = [ base mtl multiset random template-haskell ]; @@ -43339,6 +43246,20 @@ self: { broken = true; }) {}; + "builder" = callPackage + ({ mkDerivation, base, byte-order, primitive, primitive-unaligned + }: + mkDerivation { + pname = "builder"; + version = "0.2"; + sha256 = "04pcqxk9snlvm5kixqyz5aq0pxjlcvfxj403dxgyr3ch2zjx3n6l"; + libraryHaskellDepends = [ + base byte-order primitive primitive-unaligned + ]; + description = "bounded ByteArray builder type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "buildwrapper" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, Cabal , cmdargs, conduit, conduit-extra, containers, cpphs, deepseq @@ -43935,12 +43856,17 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, primitive, primitive-addr, run-st }: + ({ mkDerivation, base, primitive, primitive-addr, run-st, tasty + , tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "byteslice"; - version = "0.1.2.0"; - sha256 = "0bivb6gn3kfzi2rxvrf3klsgzj6p864vcxr2hnrdkr16qp1x8ysv"; + version = "0.1.3.0"; + sha256 = "0lx69pcac7p20zs790x6ygqlgc3vljn4wjjp1jlcnp1jv6nhfwgf"; libraryHaskellDepends = [ base primitive primitive-addr run-st ]; + testHaskellDepends = [ + base primitive tasty tasty-hunit tasty-quickcheck + ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44842,6 +44768,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.1"; sha256 = "1yb3wvjqqmkm4aysfyx4zf1z88453ywfc4czb4zvghfdgd95d0rx"; + revision = "1"; + editedCabalFile = "054xaxj0cf8cdd2l5jp3p4s3ar8ncq92cw3s0912vd85kw2bw3rl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45033,6 +44961,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-flatpak" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan + , containers, http-client, http-client-tls, http-types + , optparse-applicative, pathtype, shell-utility, text, utility-ht + }: + mkDerivation { + pname = "cabal-flatpak"; + version = "0.0"; + sha256 = "0ci55nzlp1hqx31m7pw37ms8pb053gb85126pszpsd8n7yvlra9w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cabal-plan containers + http-client http-client-tls http-types optparse-applicative + pathtype shell-utility text utility-ht + ]; + description = "Generate a FlatPak manifest from a Cabal package description"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-fmt" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, mtl, optparse-applicative, parsec, pretty, process @@ -45367,30 +45315,28 @@ self: { "cabal-plan" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat - , base-orphans, base16-bytestring, bytestring, containers - , directory, filepath, mtl, optparse-applicative, parsec, text - , vector + , base16-bytestring, bytestring, containers, directory, filepath + , lens, mtl, optparse-applicative, parsec, semialign + , singleton-bool, text, these, topograph, transformers, vector }: mkDerivation { pname = "cabal-plan"; - version = "0.5.0.0"; - sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq"; - revision = "1"; - editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp"; + version = "0.6.0.0"; + sha256 = "0yhczs9qc6vy1g0jgj6hb23g4f92qnwq325zxlazsghcvxjrxhx2"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat base-orphans base16-bytestring bytestring - containers directory filepath text vector + aeson base base16-bytestring bytestring containers directory + filepath text ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers directory mtl - optparse-applicative parsec text vector + ansi-terminal base base-compat bytestring containers directory lens + mtl optparse-applicative parsec semialign singleton-bool text these + topograph transformers vector ]; - doHaddock = false; description = "Library and utility for processing cabal's plan.json file"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; + license = stdenv.lib.licenses.gpl2Plus; }) {}; "cabal-progdeps" = callPackage @@ -46017,10 +45963,10 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring - , cachix-api, conduit, conduit-extra, containers, cookie - , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here - , hnix-store-core, hspec, hspec-discover, http-client + ({ mkDerivation, async, base, base64-bytestring, boost_context + , bytestring, cachix-api, conduit, conduit-extra, containers + , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify + , here, hnix-store-core, hspec, hspec-discover, http-client , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp , lzma-conduit, megaparsec, memory, mmorph, netrc, nix , optparse-applicative, process, protolude, resourcet, retry @@ -46030,8 +45976,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.0"; - sha256 = "0s22p9dwqw4pqlrqfqspdsiiw2k5zwzzdxc6ha6f4fxa4wa2w5dm"; + version = "0.3.2"; + sha256 = "0i0p5cp6g5ai2xxdkr0bbdlf469b52lp3fh37rq075zaw94f6qr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46044,6 +45990,7 @@ self: { servant-auth-client servant-client servant-client-core servant-conduit text unix uri-bytestring versions ]; + librarySystemDepends = [ boost_context ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; @@ -46052,7 +45999,7 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - }) {inherit (pkgs) nix;}; + }) {boost_context = null; inherit (pkgs) nix;}; "cachix-api" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring @@ -46791,6 +46738,8 @@ self: { pname = "cantor-pairing"; version = "0.1.1.0"; sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; + revision = "1"; + editedCabalFile = "1rl4zjxwiys9mf75bvw363ydpr3nwvi6d77p19rwnmxc9k5spap6"; libraryHaskellDepends = [ arithmoi base containers integer-gmp integer-logarithms ]; @@ -48255,8 +48204,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.2.3"; - sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53"; + version = "0.1.2.4"; + sha256 = "1ijfgs03zs6cj87s7sck4md1qmfavcmgnfz8asw8yf6bf0rk6qfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50004,6 +49953,8 @@ self: { pname = "chronos"; version = "1.0.7"; sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; + revision = "1"; + editedCabalFile = "0rf2rcdx7cvx1aa6yb9khbgkrh08v4l52sg1w89qz0245dalw14r"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -52804,8 +52755,8 @@ self: { pname = "co-log"; version = "0.3.0.0"; sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; - revision = "2"; - editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f"; + revision = "3"; + editedCabalFile = "0z2456b49k0qfd4fzvbwndvdvnwfvsmhyxd5gmbiz7l7b458dq3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53734,18 +53685,17 @@ self: { }) {}; "colour-space" = callPackage - ({ mkDerivation, base, colour, constrained-categories, JuicyPixels - , linear, linearmap-category, manifolds, semigroups, vector-space + ({ mkDerivation, base, call-stack, colour, constrained-categories + , JuicyPixels, lens, linear, linearmap-category, manifolds + , semigroups, vector-space }: mkDerivation { pname = "colour-space"; - version = "0.1.4.0"; - sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; - revision = "2"; - editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg"; + version = "0.1.5.0"; + sha256 = "13xmn8l11r06xna575sw6sdhp2rj25q8qd9ljbjpl37fr1qbc8xs"; libraryHaskellDepends = [ - base colour constrained-categories JuicyPixels linear - linearmap-category manifolds semigroups vector-space + base call-stack colour constrained-categories JuicyPixels lens + linear linearmap-category manifolds semigroups vector-space ]; description = "Instances of the manifold-classes for colour types"; license = stdenv.lib.licenses.gpl3; @@ -54581,8 +54531,8 @@ self: { }: mkDerivation { pname = "compensated"; - version = "0.7.2"; - sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7"; + version = "0.7.3"; + sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -55845,6 +55795,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms_0_0_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, conduit-zstd, containers + , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit + , monad-control, mtl, pqueue, resourcet, stm, stm-conduit + , streaming-commons, test-framework, test-framework-hunit + , test-framework-th, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.11.0"; + sha256 = "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq directory exceptions + HUnit lzma-conduit monad-control mtl pqueue resourcet stm + stm-conduit streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector + ]; + benchmarkHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers criterion deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -56332,8 +56318,6 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conferer" = callPackage @@ -56342,8 +56326,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "0.1.0.1"; - sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467"; + version = "0.1.0.4"; + sha256 = "0zzc6m52a3rsd6cs7ns95rk1bl1gf9dyrz7lx0kakibxpb11sgsy"; libraryHaskellDepends = [ base bytestring containers directory text ]; @@ -56354,6 +56338,71 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hspec" = callPackage + ({ mkDerivation, base, conferer, hspec, hspec-core, text }: + mkDerivation { + pname = "conferer-hspec"; + version = "0.1.0.1"; + sha256 = "1wjn4my0grb62vkswvxa4674s0fid6kskvxz1qll14gqw6wlkx19"; + libraryHaskellDepends = [ base conferer hspec-core text ]; + testHaskellDepends = [ base conferer hspec hspec-core text ]; + description = "conferer's FromConfig instances for hspec Config"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-provider-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, conferer, directory + , hspec, text, unordered-containers, vector + }: + mkDerivation { + pname = "conferer-provider-json"; + version = "0.1.0.2"; + sha256 = "1iww8w6d7710b58yqiap10jkbgb08ah3szc259p7wn4lnv96cic0"; + libraryHaskellDepends = [ + aeson base bytestring conferer directory text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring conferer directory hspec text + unordered-containers vector + ]; + description = "Configuration for reading json files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-snap" = callPackage + ({ mkDerivation, base, conferer, hspec, snap-core, snap-server + , text + }: + mkDerivation { + pname = "conferer-snap"; + version = "0.1.0.3"; + sha256 = "07x1grjqq5dsz7w8vrkzdaknfvqkvjqkmjwjiixn51jxfg6011zq"; + libraryHaskellDepends = [ + base conferer snap-core snap-server text + ]; + testHaskellDepends = [ + base conferer hspec snap-core snap-server text + ]; + description = "conferer's FromConfig instances for snap Config"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-warp" = callPackage + ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp + }: + mkDerivation { + pname = "conferer-warp"; + version = "0.1.0.1"; + sha256 = "1alzbcm4bkp2a5p53b3vpnl0zgnz8bm2rpn2aljs24wz3vapgzsa"; + libraryHaskellDepends = [ base conferer http-types text wai warp ]; + testHaskellDepends = [ + base conferer hspec http-types text wai warp + ]; + description = "conferer's FromConfig instances for warp settings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "confetti" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, MissingH , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml @@ -56469,10 +56518,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "1.1.0.0"; - sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl"; - revision = "1"; - editedCabalFile = "0h828xld2dfjj43jwq1f98wd21nzvhn74wsx586a0kcd6q41pcs5"; + version = "1.2.0.0"; + sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -56503,12 +56550,11 @@ self: { ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.6.3.1"; - sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z"; - revision = "2"; - editedCabalFile = "037hi6hrd3kk2zjsi8ly9jj4gc8xq5vnn8p09dm0hshd31fyhl52"; + version = "0.7.0.1"; + sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; license = stdenv.lib.licenses.mit; }) {}; @@ -57630,7 +57676,7 @@ self: { version = "0.1.0.1"; sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; libraryHaskellDepends = [ base ]; - description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; + description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -57831,6 +57877,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "control-monad-omega_0_3_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "control-monad-omega"; + version = "0.3.2"; + sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n"; + libraryHaskellDepends = [ base ]; + description = "A breadth-first list monad"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58814,22 +58872,22 @@ self: { ({ mkDerivation, base, binary, bytestring, bzlib , composition-prelude, containers, cpphs, dhall, dir-traverse , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzma, megaparsec + , http-client, http-client-tls, libarchive, lzlib, lzma, megaparsec , microlens, mtl, network-uri, optparse-applicative, prettyprinter , process, recursion, tar, temporary, text, zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.2.3.1"; - sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w"; - revision = "2"; - editedCabalFile = "15bn9c0zvr8xdhq4hgnq3hhqwvv8pc5a7bdvw58psn7dwhcac6nh"; + version = "0.2.3.2"; + sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r"; + revision = "1"; + editedCabalFile = "1c38aadl6lfnid8ipmpvm78mlvb0rgqr5sdjg86y1ks4q45nqw3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring bzlib composition-prelude containers dhall dir-traverse directory filemanip filepath hashable http-client - http-client-tls libarchive lzma megaparsec microlens mtl + http-client-tls libarchive lzlib lzma megaparsec microlens mtl network-uri prettyprinter process recursion tar temporary text zip-archive zlib ]; @@ -66029,8 +66087,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "3"; - editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs"; + revision = "4"; + editedCabalFile = "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -66776,23 +66834,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances - , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "deque"; - version = "0.4.2.3"; - sha256 = "18j4pqqn65nh4wp3fkw4bd10x1gxnv5zfkzan02fqvdg1ljk9sq0"; - libraryHaskellDepends = [ base mtl strict-list ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Double-ended queues"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_4_3" = callPackage ({ mkDerivation, base, hashable, mtl, QuickCheck , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit , tasty-quickcheck @@ -66808,7 +66849,6 @@ self: { ]; description = "Double-ended queues"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -67487,43 +67527,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_25_0" = callPackage + "dhall_1_26_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, cryptonite, deepseq, Diff, directory, doctest - , dotgen, either, exceptions, filepath, foldl, gauge, haskeline - , http-client, http-client-tls, http-types, lens-family-core - , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, semigroups - , serialise, spoon, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-lift-instances, transformers - , transformers-compat, turtle, unordered-containers, uri-encode - , vector + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-lift-instances + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.25.0"; - sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h"; - revision = "2"; - editedCabalFile = "00jb0n07sa6v5ynzlyz39gc6zc0s0jlfck5w64pya1nmdbiijizz"; + version = "1.26.0"; + sha256 = "1jk8zfdbvgp2ipkmhx5m1n467c1k6g24kgi295lcbyvlwahv9l7j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring case-insensitive - cborg cborg-json containers contravariant cryptonite deepseq Diff - directory dotgen either exceptions filepath haskeline http-client - http-client-tls http-types lens-family-core megaparsec memory mtl - optparse-applicative parsers prettyprinter + cborg cborg-json containers contravariant cryptonite data-fix + deepseq Diff directory dotgen either exceptions filepath haskeline + http-client http-client-tls http-types lens-family-core megaparsec + memory mtl network-uri optparse-applicative parsers prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text th-lift-instances transformers transformers-compat unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring cborg containers deepseq directory doctest filepath - foldl lens-family-core megaparsec mockery prettyprinter QuickCheck - quickcheck-instances semigroups serialise spoon tasty tasty-hunit + base bytestring cborg containers data-fix deepseq directory doctest + filepath foldl generic-random lens-family-core megaparsec mockery + prettyprinter QuickCheck quickcheck-instances scientific semigroups + serialise spoon tasty tasty-expected-failure tasty-hunit tasty-quickcheck text transformers turtle vector ]; benchmarkHaskellDepends = [ @@ -67555,14 +67595,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_22" = callPackage + "dhall-bash_1_0_23" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.22"; - sha256 = "1qxcf3f8a390znwkbhcirlgqpgg0ssc3bnwdml7wkv8k0qwqq57j"; + version = "1.0.23"; + sha256 = "0nd8bziymkv2wdham8jg2wcsksnnby0pkvak7aknzf8z9s4mb74x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67626,23 +67666,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_4_0" = callPackage + "dhall-json_1_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base - , bytestring, containers, dhall, exceptions, libyaml + , bytestring, containers, dhall, exceptions, filepath, libyaml , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , scientific, tasty, tasty-hunit, text, unordered-containers , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.4.0"; - sha256 = "0kxb71m1rf6y7z3wx4yx5ks0p5vhnlpgchsih3mfn9ygppc2z0ri"; + version = "1.4.1"; + sha256 = "1widvpgrswj6bz9330i2xyxv1h6asw0pm5rrwdhyf926qgag83pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers dhall exceptions - libyaml optparse-applicative scientific text unordered-containers - vector yaml + filepath libyaml optparse-applicative prettyprinter scientific text + unordered-containers vector yaml ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring dhall exceptions @@ -67677,32 +67717,27 @@ self: { "dhall-lsp-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , cryptonite, data-default, dhall, dhall-json, directory, doctest - , dotgen, filepath, haskell-lsp, hslogger, lens, lens-family-core - , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter - , sorted-list, stm, text, transformers, unordered-containers - , uri-encode, yi-rope + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, hslogger, lens, lens-family-core, megaparsec, mtl + , network-uri, optparse-applicative, prettyprinter + , rope-utf16-splay, text, transformers, unordered-containers + , uri-encode }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.0"; - sha256 = "1i4bx8qiy1hbs6bm50fixj1ipkd9rm6y6z3bci8ngh1rhy5v51x1"; + version = "1.0.1"; + sha256 = "04x56r7wlnnks31mjis1f2688c7azimkww04qkvm7l1s0qprn1lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers cryptonite - data-default dhall dhall-json dotgen filepath haskell-lsp hslogger - lens lens-family-core megaparsec mtl network-uri - optparse-applicative prettyprinter sorted-list stm text - transformers unordered-containers uri-encode yi-rope - ]; - executableHaskellDepends = [ - aeson base containers data-default dhall filepath haskell-lsp - hslogger lens lens-family-core megaparsec mtl optparse-applicative - prettyprinter sorted-list stm text transformers - unordered-containers yi-rope + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens + lens-family-core megaparsec mtl network-uri prettyprinter + rope-utf16-splay text transformers unordered-containers uri-encode ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ base directory doctest filepath ]; + description = "Language Server Protocol (LSP) server for Dhall"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -67714,8 +67749,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.7"; - sha256 = "0axg7qq8rfy5qsffiw57lll40mw7bxgk67g7lgdb5vbri69xj3is"; + version = "1.1.8"; + sha256 = "0ky10j2718hva1xz4snwbnm0adpp1l7spxpzg7x3a7x67gnaanyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69648,19 +69683,21 @@ self: { }) {}; "dirtree" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hspec, hspec-discover, hspec-expectations-pretty-diff, lens + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hspec, hspec-discover, hspec-expectations-pretty-diff + , lens, unix, zip-archive }: mkDerivation { pname = "dirtree"; - version = "0.0.1"; - sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj"; + version = "0.1.0"; + sha256 = "0hyvaf17rfaqjag6qg3pfhbhjnhrd4xdknvn0k494vi3wd1ddzap"; libraryHaskellDepends = [ - base containers deepseq directory filepath lens + base bytestring containers deepseq directory filepath lens unix + zip-archive ]; testHaskellDepends = [ - base containers deepseq directory filepath hspec hspec-discover - hspec-expectations-pretty-diff lens + base bytestring containers deepseq directory filepath hspec + hspec-discover hspec-expectations-pretty-diff lens unix zip-archive ]; testToolDepends = [ hspec-discover ]; description = "A small library for working with directories"; @@ -69743,8 +69780,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.1.0"; - sha256 = "16n78p6g0rh670zy2pbk59c8nkg5srkhlbya0aknpz2s4smpn891"; + version = "1.1.2"; + sha256 = "1dwsg3q9jdq58pchc0aylg8acshfjmdidpr09818jr4aawvdn3xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70718,8 +70755,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.2"; - sha256 = "0123plf001136q5gd9brq6vhpnx7db6gixx5sagp5l8jd2qpb244"; + version = "1.3.0"; + sha256 = "192r9aizcjvnm0s57v056x42mvlq79fk8630g73ps6qqnb2mjy9h"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split @@ -70969,15 +71006,17 @@ self: { broken = true; }) {}; - "dl-fedora_0_6" = callPackage + "dl-fedora_0_7" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , http-directory, http-types, optparse-applicative, regex-posix , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs }: mkDerivation { pname = "dl-fedora"; - version = "0.6"; - sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh"; + version = "0.7"; + sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv"; + revision = "1"; + editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74144,8 +74183,6 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "eccrypto" = callPackage @@ -75012,8 +75049,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-core" = callPackage @@ -75710,15 +75745,15 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "elm-street_0_1_0_1" = callPackage + "elm-street_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, prettyprinter, servant, servant-server, text, time, wai , warp }: mkDerivation { pname = "elm-street"; - version = "0.1.0.1"; - sha256 = "1n02bxyva732dbnrzc6n6v8rsgpbjb6ndh4szwqj8zckj694mc77"; + version = "0.1.0.2"; + sha256 = "1ccrlcy8k2ppy20jns0rfms11ha7mpqgh6hwcpjkycmninhdb2gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75879,6 +75914,80 @@ self: { broken = true; }) {}; + "elynx-seq" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec + , hspec-megaparsec, integration, lens, math-functions, matrices + , megaparsec, mwc-random, optparse-applicative, parallel, primitive + , statistics, transformers, vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.0.1"; + sha256 = "0v43nqpx17zbqv0537jrikkfnvadcmfc5byxh8lk369ma76029y7"; + libraryHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-tools + elynx-tree hmatrix integration lens math-functions matrices + megaparsec mwc-random optparse-applicative parallel primitive + statistics transformers vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-tools + elynx-tree hmatrix hspec hspec-megaparsec integration lens + math-functions matrices megaparsec mwc-random optparse-applicative + parallel primitive statistics transformers vector vector-th-unbox + word8 + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "elynx-tools" = callPackage + ({ mkDerivation, base, bytestring, containers, fast-logger, hmatrix + , lifted-base, matrices, megaparsec, monad-control, monad-logger + , mwc-random, optparse-applicative, parallel, primitive + , template-haskell, text, time, transformers, transformers-base + , vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.0.1"; + sha256 = "17h6rncyb4insjarss4a8467d4mybmwa9dwgjrw7sb66y301xy8w"; + libraryHaskellDepends = [ + base bytestring containers fast-logger hmatrix lifted-base matrices + megaparsec monad-control monad-logger mwc-random + optparse-applicative parallel primitive template-haskell text time + transformers transformers-base vector zlib + ]; + description = "Tools for ELynx"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "elynx-tree" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-tools, hspec + , hspec-megaparsec, lifted-async, math-functions, megaparsec + , mwc-random, optparse-applicative, parallel, primitive, QuickCheck + , quickcheck-instances, statistics, transformers, vector + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.0.1"; + sha256 = "0gd14cshy143q7gdxfkb0laxbramkxlqnr2s15z89rbs75hfgqa9"; + libraryHaskellDepends = [ + base bytestring containers elynx-tools lifted-async math-functions + megaparsec mwc-random optparse-applicative parallel primitive + QuickCheck quickcheck-instances statistics transformers vector + ]; + testHaskellDepends = [ + base bytestring containers elynx-tools hspec hspec-megaparsec + lifted-async math-functions megaparsec mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics transformers vector + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -77775,8 +77884,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.1.0.1"; - sha256 = "0804zqbl2w8cvj4n9y2qx9wdmigmw56fxdzkqrw6x2szl2qvsfjz"; + version = "0.1.0.2"; + sha256 = "1z65vm457af7ffiih8yzgds059kamaiskvjfl72qqb24fmgj9jxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78594,8 +78703,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.3.0"; - sha256 = "1vg94x1f5wh20dvnqil3b3ipd8kajyplv7sv9f7zmrl73m5cgg9s"; + version = "0.4.0"; + sha256 = "09gsxzqrbjksi5gnwf7b4d2ry0cj4gqzzbpbrb404lkd5v0z1sh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78745,8 +78854,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.3.0"; - sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c"; + version = "1.3.1"; + sha256 = "1mpwd6bwyzzmg2mzbkllf2f05dsi17da5i3clvakjj9yv8dpxj3q"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -79174,8 +79283,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.7"; - sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z"; + version = "1.1.8"; + sha256 = "1nnylpjrrb6smmgl3d481wpkxpdw26yfa3jlw98p3xgm8k907486"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -80503,6 +80612,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fakedata_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hashable, hspec, hspec-discover + , random, template-haskell, text, time, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "0.3.0"; + sha256 = "11g3vja4kw7ms5bvccl4hpzvd59v2m60sk6ycx9calw13b65ix4p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath hashable + random template-haskell text time unordered-containers vector yaml + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hashable + hspec hspec-discover random template-haskell text time + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + gauge hashable random template-haskell text time + unordered-containers vector yaml + ]; + description = "Library for producing fake data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: mkDerivation { @@ -80671,6 +80811,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.1.2.0"; + sha256 = "1aa3v14nlcq4ql3f07lan9kg21dqp009yzgb96bxznyigxwf67rp"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-combinatorics" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, criterion , directory, hspec, http-client, http-client-tls, tar, zlib @@ -81415,10 +81576,8 @@ self: { }: mkDerivation { pname = "fcm-client"; - version = "0.1.0.0"; - sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl"; - revision = "1"; - editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l"; + version = "0.2.0.0"; + sha256 = "151lm6g08bwqfdi25zmsv99wri8x75fi1svwsgm2ar2hd8zjngnj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81824,6 +81983,141 @@ self: { broken = true; }) {}; + "fei-base" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, constraints, directory + , filepath, haskell-src-exts, hslogger, mtl, mxnet + , optparse-applicative, repa, text, tuple-ops, vector + }: + mkDerivation { + pname = "fei-base"; + version = "0.2.0.0"; + sha256 = "0blgzr1iy7d2cp370rankkldakkryysikh1rd039s7anq5l21rsg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base c2hs-extra constraints repa tuple-ops vector + ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base directory filepath haskell-src-exts hslogger mtl + optparse-applicative text + ]; + executableSystemDepends = [ mxnet ]; + description = "FFI to MXNet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mxnet;}; + + "fei-cocoapi" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, c2hs, conduit + , containers, criterion, directory, exceptions, fei-base + , fei-dataiter, filepath, JuicyPixels, JuicyPixels-extra + , JuicyPixels-repa, lens, mtl, random-fu, repa, storable-tuple + , store, time, transformers-base, vector + }: + mkDerivation { + pname = "fei-cocoapi"; + version = "0.2.0"; + sha256 = "0sk3h94vlykq6x4nk25scb7jwhgi9rlk66xhy09wbz1a1n398j5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + exceptions fei-base fei-dataiter filepath JuicyPixels + JuicyPixels-extra JuicyPixels-repa lens mtl random-fu repa + storable-tuple store time transformers-base vector + ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson base bytestring containers criterion JuicyPixels + JuicyPixels-repa lens repa store vector + ]; + description = "Cocodataset with cocoapi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "fei-dataiter" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, directory + , fei-base, fei-nn, filepath, haskell-src-exts, hslogger, hspec + , mtl, mxnet, optparse-applicative, streaming, template-haskell + , text + }: + mkDerivation { + pname = "fei-dataiter"; + version = "0.2.0.0"; + sha256 = "01iia8m5wq8yzmzl3dmsd5v01yq07ig6bg93h00mxyjpf1ai9kvk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit conduit-combinators fei-base fei-nn streaming + template-haskell + ]; + executableHaskellDepends = [ + base directory fei-base filepath haskell-src-exts hslogger mtl + optparse-applicative text + ]; + executableSystemDepends = [ mxnet ]; + testHaskellDepends = [ base fei-base hspec streaming ]; + description = "mxnet dataiters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mxnet;}; + + "fei-examples" = callPackage + ({ mkDerivation, attoparsec, base, conduit, directory, fei-base + , fei-cocoapi, fei-dataiter, fei-nn, lens, mtl + , optparse-applicative, random-fu, repa, text, unordered-containers + , vector + }: + mkDerivation { + pname = "fei-examples"; + version = "0.3.0"; + sha256 = "1yplcfls0c22h1808ky64ifdxswq60dq5l0qw0kmg452517xb2yx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base conduit directory fei-base fei-cocoapi fei-dataiter + fei-nn lens mtl optparse-applicative random-fu repa text + unordered-containers vector + ]; + description = "fei examples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "fei-nn" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-binary, base + , bytestring, containers, exceptions, fei-base, ghc-prim, graphviz + , lens, mmorph, mtl, resourcet, template-haskell, text, time + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "fei-nn"; + version = "0.2.0"; + sha256 = "08zdp0h87cddrwb7wrbk341k7v8hhriqp1jhgf6nmkjgqlwspk0m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions fei-base graphviz lens + mtl resourcet template-haskell text time transformers-base + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions fei-base + ghc-prim mmorph mtl resourcet unordered-containers vector + ]; + description = "Train a neural network with MXNet in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "feldspar-compiler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, criterion , data-default, deepseq, directory, feldspar-language, filepath @@ -82994,15 +83288,17 @@ self: { "finitary" = callPackage ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , monad-loops, mtl, template-haskell, vector-sized + , monad-loops, mtl, primitive, template-haskell, typelits-witnesses + , vector, vector-sized }: mkDerivation { pname = "finitary"; - version = "0.1.0.0"; - sha256 = "0s42ja10hnv1czy75wh8bkz3mj9qwy0bsa90bnwnazf9q6xn9lyv"; + version = "1.1.0.1"; + sha256 = "13rvwymzsl91zwvc565ysakn8lznwwfnrg0d4vxvlqqrrkbkca1p"; libraryHaskellDepends = [ base bitvec coercible-utils finite-typelits ghc-typelits-knownnat - ghc-typelits-natnormalise mtl template-haskell vector-sized + ghc-typelits-natnormalise mtl primitive template-haskell + typelits-witnesses vector vector-sized ]; testHaskellDepends = [ base bitvec finite-typelits hedgehog monad-loops vector-sized @@ -83011,6 +83307,30 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "finitary-derive" = callPackage + ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary + , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat + , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector + , vector-sized + }: + mkDerivation { + pname = "finitary-derive"; + version = "1.0.0.1"; + sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim"; + libraryHaskellDepends = [ + base binary coercible-utils deepseq finitary finite-typelits + ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector + vector-sized + ]; + testHaskellDepends = [ + base finitary finite-typelits hedgehog hedgehog-classes monad-loops + ]; + description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "finite-field" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, primes , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -83133,6 +83453,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "first-class-families_0_6_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "first-class-families"; + version = "0.6.0.0"; + sha256 = "0a1f789d3lv8hvd3nidwglx11yvwiakvmabpz1hzgdjyfnrpg98n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "First class type families"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "first-class-patterns" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -88356,6 +88689,22 @@ self: { license = "GPL"; }) {}; + "fvars" = callPackage + ({ mkDerivation, async, base, exceptions, hspec, monad-control, mtl + , transformers + }: + mkDerivation { + pname = "fvars"; + version = "1.0.0.0"; + sha256 = "0iwlmr388wv98n244wdzwk5l7j6p669pq3vwavpnk37wfanahvxj"; + libraryHaskellDepends = [ + base exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ async base hspec ]; + description = "Fast Mutable Vars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fwgl" = callPackage ({ mkDerivation, base, hashable, transformers, unordered-containers , vect, vector, Yampa @@ -88643,10 +88992,8 @@ self: { }: mkDerivation { pname = "gamgee"; - version = "1.1.0"; - sha256 = "0ip6y8l2dmw15494d77s771aqmn7awrqnlmbcc7dd2lqwq5s5wgr"; - revision = "1"; - editedCabalFile = "1lg04ps7m85x4py844vcc53a3r6ijaqzjrggrwp53iv2ga1m88sr"; + version = "1.2.0"; + sha256 = "0q7r4bspxsqaswcy9c90wl7bh19y0k1lds0rx1m0cla7rg5ixra4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89931,6 +90278,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generics-mrsop-gdiff" = callPackage + ({ mkDerivation, base, generics-mrsop }: + mkDerivation { + pname = "generics-mrsop-gdiff"; + version = "0.0.0"; + sha256 = "0a60q7g5x7kwd864dc7yz83kz83fxf4gpj7q5lj4f2fg69ih0ybm"; + libraryHaskellDepends = [ base generics-mrsop ]; + description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell @@ -90419,6 +90777,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-mergeful" = callPackage + ({ mkDerivation, base, containers, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid + , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid + }: + mkDerivation { + pname = "genvalidity-mergeful"; + version = "0.0.0.0"; + sha256 = "07j3dczqxmwri458r8nml3rn31ii14fdz3b2sc8g41f2czr6fa75"; + libraryHaskellDepends = [ + base containers genvalidity genvalidity-containers genvalidity-time + mergeful QuickCheck + ]; + testHaskellDepends = [ + base containers genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random + time uuid + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-mergeless" = callPackage ({ mkDerivation, base, containers, genvalidity , genvalidity-containers, genvalidity-hspec @@ -91778,27 +92158,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.5"; - sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_6" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.6"; sha256 = "1rypk644xpgvawymn8ib992n4qkc2fc796arf574hhikdffr5a14"; isLibrary = true; @@ -91812,7 +92171,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -92392,6 +92750,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcide" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, containers + , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot + , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types + , hie-bios, lens, lsp-test, mtl, network-uri, optparse-applicative + , parser-combinators, prettyprinter, prettyprinter-ansi-terminal + , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb + , tasty, tasty-hunit, text, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "ghcide"; + version = "0.0.3"; + sha256 = "0czmgw2wfsycxs3lbs838xmgdvk52ry0dnb0dgxmafqgdi0l7xi3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default deepseq + directory extra filepath ghc ghc-boot ghc-boot-th hashable + haskell-lsp haskell-lsp-types mtl network-uri prettyprinter + prettyprinter-ansi-terminal rope-utf16-splay safe-exceptions shake + sorted-list stm syb text time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base containers data-default directory extra filepath ghc ghc-paths + haskell-lsp hie-bios optparse-applicative shake text + ]; + testHaskellDepends = [ + base containers extra filepath ghc haskell-lsp-types lens lsp-test + parser-combinators tasty tasty-hunit text + ]; + description = "The core of an IDE"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -93309,8 +93705,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative"; - version = "0.5.0"; - sha256 = "0nhacfja1wrz0sa5pbz069sbpyzp8jnlrp078gg9gydwhlmh2k2h"; + version = "0.6.0"; + sha256 = "1637w7vfzjxwqgwfan793j03h7g39xci4v1vg54y9ar05pp0ggv8"; libraryHaskellDepends = [ base data-default-class gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading mtl text @@ -93333,8 +93729,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.5.0"; - sha256 = "0vl9gqgdbqr4hipr7ka01hyvyz9n8by0ry890w4n2c5w9rghgvva"; + version = "0.6.0"; + sha256 = "0szfmpgsslq5cs5q8574gpmm897vvs51g4wvdinnkglbf70254kf"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes @@ -94018,8 +94414,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190819"; - sha256 = "1fvyxx47qx7yr8xfan398jlixbawblpz5h69kqsw1z7kh6plnycy"; + version = "7.20190912"; + sha256 = "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -94517,6 +94913,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "githash_0_1_3_3" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.3.3"; + sha256 = "19xhs2nzm1myyjx3nkc3invy15c19cfx790vbcrl050n9sb330jr"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -94751,6 +95167,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks_0_11_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.11.0"; + sha256 = "1x9vwx7k8xyblfxqny7almqlzzncnm315x6dq6y2bzsl9sxwvnkg"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, bytestring, daemons, data-default, directory , mtl, network, parsec, process, tasty, tasty-hunit @@ -95502,8 +95937,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.32"; - sha256 = "0rlqmmjxvynd4a2kxjyw7dm5i2rd27jgj7sm57pbh2nig2rbbbyj"; + version = "2.33"; + sha256 = "14znjbgy67mh68hpbr2xxl1aff1b0bzmrwkknp402zq0y9p81iwy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -95680,6 +96115,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_13_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.13.1.1"; + sha256 = "1bmjwd2vfbxfypr2g23810yyp921m30wxbb6f3m0wkk65iypjnls"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { @@ -95823,6 +96274,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-raster_1_13_1_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering + , repa + }: + mkDerivation { + pname = "gloss-raster"; + version = "1.13.1.1"; + sha256 = "199b1avi4mils3x9xpk66992id40hdyk0lpjnyyxy8c22s0adgb9"; + libraryHaskellDepends = [ + base containers ghc-prim gloss gloss-rendering repa + ]; + description = "Parallel rendering of raster images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate @@ -99472,15 +99939,20 @@ self: { }) {}; "grafana" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, text }: + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , Diff, tasty, tasty-hunit, text + }: mkDerivation { pname = "grafana"; - version = "0.1"; - sha256 = "0k8a8bwyn9hvn4j3wn4crqdjg2xh36zxlka0ddx3qj6fmbfl1lps"; + version = "0.2"; + sha256 = "0aqg2ivbdm3459pa4077bhs6y3q9z3nwsajgp4b5ah3wnav1rn45"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring text + aeson aeson-pretty base bytestring containers text ]; - description = "grafana datatypes for dashboards"; + testHaskellDepends = [ + aeson aeson-pretty base bytestring Diff tasty tasty-hunit + ]; + description = "API for creating grafana dashboards represented as json"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99550,14 +100022,14 @@ self: { "grammatical-parsers" = callPackage ({ mkDerivation, base, checkers, containers, criterion, deepseq - , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes - , size-based, tasty, tasty-quickcheck, testing-feat, text - , transformers + , doctest, markdown-unlit, monoid-subclasses, parsers, QuickCheck + , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat + , text, transformers }: mkDerivation { pname = "grammatical-parsers"; - version = "0.4"; - sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6"; + version = "0.4.0.1"; + sha256 = "049xz8gscqxn5k5vy34zc97w4in4scv89jvd71kxf24yvxblzayz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99571,6 +100043,7 @@ self: { QuickCheck rank2classes size-based tasty tasty-quickcheck testing-feat ]; + testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ base containers criterion deepseq monoid-subclasses parsers rank2classes text @@ -103101,6 +103574,8 @@ self: { pname = "hackage-db"; version = "2.0.1"; sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph"; + revision = "1"; + editedCabalFile = "0l2zdajacqibwkjs5pif6a3mxns9jpc6iry7xxqcfis4n9ks404a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103112,6 +103587,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.0"; + sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; + revision = "1"; + editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -104284,8 +104781,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.0.0"; - sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b"; + version = "4.13.0.1"; + sha256 = "0728947np74z8dn1p55bqsv1bgx0ipaiajankwnnmp5mk0lkixd6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104306,8 +104803,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -105970,8 +106465,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.2"; - sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1"; + version = "7.5.3"; + sha256 = "05ki6j3cc9pfqaf7qbr2g4z4kdn4zjrqd3n0n02n9297bcvcschp"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -106354,8 +106849,8 @@ self: { }: mkDerivation { pname = "harg"; - version = "0.2.0.0"; - sha256 = "0zdngzz1p73dpfx4klxf59yhk4qf0r4ming2nw4yqfsyxqfwgw1i"; + version = "0.4.0.0"; + sha256 = "0il36pwzmkc1dj39kybyp6hv4s7d60dl5rx1fkfm23dcg6a9r0dc"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy optparse-applicative split text yaml @@ -106560,8 +107055,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.20"; - sha256 = "0xqi3hb1xgbkkj8wmrvp39sh7zcj75v55xbha87nmkl2g56kaxw2"; + version = "0.0.0.22"; + sha256 = "06bad2hbzmrrav1f7fsszrspxghziy6jpmgr39nbs375fbqib4kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108081,10 +108576,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.15.0.1"; - sha256 = "0l11psgknqppisn102h2392y5jiyz026rv8v2dpq4bk50zibb7qb"; - revision = "1"; - editedCabalFile = "0rk44rxal0sm1ci7c0phwl7fpcby1vys3n3vpp4bgla2hrc6pwba"; + version = "0.15.0.0"; + sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108162,10 +108655,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.15.0.1"; - sha256 = "07195h5qdmnkrr7v1yx8l398vi4zbcawbh7k6slyj3xs3zq9s6kx"; - revision = "1"; - editedCabalFile = "06naxwj75jxy9xvvlc229m1jn9bandqsxaavzm7zj9vw8sxygr0h"; + version = "0.15.0.0"; + sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -108750,8 +109241,10 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.21.0.0"; - sha256 = "0h8m1w995mpdca9is7lwv9n1w7khr5cnxzam21x7w47i546wm9rm"; + version = "1.21.1.0"; + sha256 = "1zw95fdbqgn9653fgbcpdc364ps07v0zgvwxng8yi2dhdnlhjqra"; + revision = "1"; + editedCabalFile = "0mc1n7bkwbykrw1wivj1mvm69a0j1089vbrg8vc1cfkmcdib3xdj"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; @@ -110482,8 +110975,8 @@ self: { }: mkDerivation { pname = "haskseg"; - version = "0.1.0.1"; - sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc"; + version = "0.1.0.2"; + sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111644,6 +112137,8 @@ self: { pname = "hasty-hamiltonian"; version = "1.3.2"; sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6"; + revision = "1"; + editedCabalFile = "1k883ziy63p3zmpyfzck5jw2143b6ijcsvwi704rp94pvh0vk02z"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -112857,6 +113352,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) hdf5;}; + "hdiff" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite + , generics-mrsop, generics-mrsop-gdiff, gitrev, hspec, language-lua + , memory, mtl, optparse-applicative, parsec, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, text + }: + mkDerivation { + pname = "hdiff"; + version = "0.0.0"; + sha256 = "0vs55wrcip9djhdwd5wz44d8w5hfafdck4abhc488b23chdxxxi9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff hspec memory mtl prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + executableHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff gitrev hspec language-lua memory mtl + optparse-applicative parsec prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + testHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff hspec memory mtl prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + description = "Pattern-Expression-based differencing of arbitrary types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hdigest" = callPackage ({ mkDerivation, base, cgi, Crypto, network, parsec, random, time }: @@ -113247,8 +113776,6 @@ self: { ]; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heavy-logger-instances" = callPackage @@ -113318,6 +113845,35 @@ self: { broken = true; }) {}; + "hedgehog_0_6_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text + , th-lift, time, transformers, transformers-base, unix + , wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "0.6.1"; + sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; + revision = "5"; + editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text th-lift time transformers transformers-base + unix wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers pretty-show semigroups text transformers + ]; + description = "Hedgehog will eat all your bugs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions, fail @@ -113345,6 +113901,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions, fail + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.1"; + sha256 = "1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0"; + revision = "1"; + editedCabalFile = "0dq3ry7py2wsiwxar11zbvm3xmifm92nx4bh61lqxzmpwyyiwnxn"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions fail lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -114818,6 +115402,8 @@ self: { pname = "hexpat-lens"; version = "0.1.8"; sha256 = "05c5pjxxsivcbppbl2n8dwyv6zh7azc3l998s2rhgjja55cpfmg0"; + revision = "1"; + editedCabalFile = "0z7cqm5alscaspaiz5pgwlcn6njhggyizqb1v5ay4sbac7v8nqlx"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -115809,8 +116395,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.1.1"; - sha256 = "119rqh12bq5gq5y708hxr0zci1dq8wf44xzxgxhhx4sb5zgj1l2p"; + version = "0.2.1"; + sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117515,8 +118101,8 @@ self: { pname = "hledger-api"; version = "1.14"; sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; - revision = "1"; - editedCabalFile = "05jlbpp4p45q8bd3152l0fm4xz9yvz07ip2cd0kplzvwnmy8sfrg"; + revision = "4"; + editedCabalFile = "126l1d6dirg0kn5p5wdrjnkckn6jsycrvqsh63ysiwswn096gf4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119275,8 +119861,8 @@ self: { pname = "hoist-error"; version = "0.2.1.0"; sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss"; - revision = "1"; - editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5"; + revision = "2"; + editedCabalFile = "1wk9a58ychqfabbrh8zdzzd7cfvwgf8xyfi6ynsckh1yb5xa4f7j"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -119875,10 +120461,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.2.3"; - sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj"; - revision = "1"; - editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d"; + version = "0.3"; + sha256 = "08a10bmnr15bb6pdcq4hq3z4595spsq3g8879apcqb6qgbs6dlxb"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -121884,6 +122468,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hs-ix" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, hs-functors + , smallcheck, tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "hs-ix"; + version = "0.1.1.0"; + sha256 = "1a1plgzbqk4jhf5lyfx82yillcmy38lzlqwsfhnlka5h6f9j10hx"; + libraryHaskellDepends = [ + base base-unicode-symbols hs-functors util + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Indexed monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-java" = callPackage ({ mkDerivation, array, base, binary, binary-state, bytestring , containers, control-monad-exception, data-binary-ieee754 @@ -123794,14 +124395,14 @@ self: { }) {}; "hsimport" = callPackage - ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre - , filepath, haskell-src-exts, ilist, microlens, mtl, split, tasty - , tasty-golden, text + ({ mkDerivation, attoparsec, base, bytestring, cmdargs, directory + , dyre, filepath, haskell-src-exts, ilist, microlens, mtl, split + , tasty, tasty-golden, text, utf8-string }: mkDerivation { pname = "hsimport"; - version = "0.10.0"; - sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829"; + version = "0.11.0"; + sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123810,7 +124411,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base filepath haskell-src-exts tasty tasty-golden + base bytestring filepath haskell-src-exts tasty tasty-golden + utf8-string ]; doHaddock = false; description = "Extend the import list of a Haskell source file"; @@ -124699,17 +125301,17 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-core, silently - , simple-get-opt + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.1.0.0"; - sha256 = "191z6pxks4ic1b8lzyfd8f3kw3zwmywvj8psd17lb65z121grj46"; + version = "0.1.0.1"; + sha256 = "1h29jffq33r5ffcni50ypa03x7qvx8yymdrp5nck9q8ykiivry22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory hspec-core ]; - executableHaskellDepends = [ base directory simple-get-opt ]; + executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; license = stdenv.lib.licenses.mit; @@ -126646,6 +127248,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.3"; sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; + revision = "1"; + editedCabalFile = "07zw749vwqdr2lznxivfa22smq7k3h0innanl5wwyf29dq4gk464"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -128683,14 +129287,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_4_0_0" = callPackage + "hvega_0_4_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers, vector }: mkDerivation { pname = "hvega"; - version = "0.4.0.0"; - sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq"; + version = "0.4.1.0"; + sha256 = "1qjswpgn1ass1x4bk5zjv6vvw7vvsbzh00qc6jjfq3bnljrl4i75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128793,8 +129397,8 @@ self: { pname = "hw-bits"; version = "0.7.0.6"; sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; - revision = "1"; - editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb"; + revision = "2"; + editedCabalFile = "1lp2kbmdc5lq7xqi2ix7jccw1gmjxl1q01bflj8fzr2f713m9yrr"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -128966,6 +129570,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.1.0"; sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v"; + revision = "1"; + editedCabalFile = "100fwgcby3nfmx2ailf8zggq0sbh5fm65x4dxyaayfzs8ngfi5is"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129103,6 +129709,8 @@ self: { pname = "hw-ip"; version = "2.3.4.1"; sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd"; + revision = "1"; + editedCabalFile = "0djvl3qvy4km5qxg5pakgck8vr5hh0md8h9h4sgsvjafcqjrza3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129164,7 +129772,7 @@ self: { broken = true; }) {}; - "hw-json_1_3_0_1" = callPackage + "hw-json_1_3_1_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits @@ -129176,8 +129784,10 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.0.1"; - sha256 = "10m4f4jv3wb4n4na1d1a26s81n7clxgmj2745xs9yrax1wvqnjg0"; + version = "1.3.1.0"; + sha256 = "0y5gxr4db381lndjr666l6vl022z9pnp5ypsmrwxcx53hv7glzwn"; + revision = "1"; + editedCabalFile = "1aw2sg7vchf9jd01dkvcbw33n6l5hgi4kyhjk4syr6cnyxysf187"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129236,6 +129846,8 @@ self: { pname = "hw-json-simd"; version = "0.1.0.2"; sha256 = "13i41ppi3ncisfyl3jvpgf4cbx86gyy0maq1xm0jipplkr78844w"; + revision = "1"; + editedCabalFile = "1vbq16ik20yvipvlpf9jrdsv33ynm152rr7c67lcdv8nf4gg4mhq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -129259,6 +129871,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.0.1"; sha256 = "0asvkzz0dgcc5cjrn3wqhn3svxi13wfzxi0ggc8mzzmfci07jigy"; + revision = "1"; + editedCabalFile = "1cpmvmncn3w60lacx21yg9snrmaghn9icgb67g2lfviya6a5qgs8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129455,6 +130069,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.0.0"; sha256 = "1nspd5hwn32fjgxmg08bq8hmyxzh61gc72zgd24mcpy94kzq58xd"; + revision = "1"; + editedCabalFile = "0ilqka4s82kwqrp876gfv6wp7gvlxkfzgxdz23l937vwx988cf1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129522,6 +130138,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_2_32" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.32"; + sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers unliftio-core + vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -129749,17 +130391,18 @@ self: { "hw-uri" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-s3, base, bytestring, directory, exceptions - , filepath, hedgehog, hspec, hspec-discover, http-client - , http-types, hw-hspec-hedgehog, lens, mtl, resourcet, text + , filepath, generic-lens, hedgehog, hspec, hspec-discover + , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet + , text }: mkDerivation { pname = "hw-uri"; - version = "0.1.1.0"; - sha256 = "1f96632k6pcaxhy2nrm13s9kdb0dz3vsav6hzf94wlv7zdlncn8x"; + version = "0.1.1.4"; + sha256 = "1y3rf1npqx3y3pkaipbwhabszvp0427h3sa9f6a5dfy14c6vm88b"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 - base bytestring directory exceptions filepath http-client - http-types lens mtl resourcet text + base bytestring directory exceptions filepath generic-lens + http-client http-types lens mtl resourcet text ]; testHaskellDepends = [ aeson antiope-core antiope-s3 base bytestring filepath hedgehog @@ -130889,20 +131532,18 @@ self: { ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory , distributive, doctest, filepath, generic-deriving, hashable, lens - , reflection, safecopy, semigroupoids, semigroups, simple-reflect - , siphash, tagged, vector + , reflection, semigroupoids, semigroups, simple-reflect, siphash + , tagged, vector }: mkDerivation { pname = "hyperloglog"; - version = "0.4.2"; - sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m"; - revision = "1"; - editedCabalFile = "1zh47rrwih6933hhq9vd0ly5s42w0bn196znkg9l8q6r6drl7xsf"; + version = "0.4.3"; + sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable lens reflection safecopy - semigroupoids semigroups siphash tagged vector + deepseq distributive hashable lens reflection semigroupoids + semigroups siphash tagged vector ]; testHaskellDepends = [ base directory doctest filepath generic-deriving semigroups @@ -131459,16 +132100,16 @@ self: { "ideas" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , containers, Diff, directory, filepath, HDBC, HDBC-sqlite3 - , http-types, network, parsec, QuickCheck, random + , http-types, mtl, network, parsec, QuickCheck, random , streaming-commons, time, uniplate, wai, wl-pprint }: mkDerivation { pname = "ideas"; - version = "1.7"; - sha256 = "0blazd950wpxjg0mfcx64m32wgcgia34gki987xgqmgkqyc5y2hm"; + version = "1.8"; + sha256 = "0bkcn9rc2bwnfy7n7yja9dlzpjfyvbjj3i10h7clhz59k9x5d8km"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive containers Diff - directory filepath HDBC HDBC-sqlite3 http-types network parsec + directory filepath HDBC HDBC-sqlite3 http-types mtl network parsec QuickCheck random streaming-commons time uniplate wai wl-pprint ]; description = "Feedback services for intelligent tutoring systems"; @@ -131496,6 +132137,21 @@ self: { broken = true; }) {}; + "ideas-math-types" = callPackage + ({ mkDerivation, base, containers, ideas, parsec, QuickCheck }: + mkDerivation { + pname = "ideas-math-types"; + version = "1.0"; + sha256 = "0r72ld0kvyqn21mndhv7gvaa43ydpyv5n6b4lhn9k0wzz2s5q8md"; + libraryHaskellDepends = [ + base containers ideas parsec QuickCheck + ]; + description = "Common types for mathematical domain reasoners"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "idempotent" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -133331,6 +133987,8 @@ self: { pname = "indexed-list-literals"; version = "0.2.1.2"; sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; + revision = "1"; + editedCabalFile = "198hmw2m3539vmh3s58d33h6vl5d0fqpdms8rp8cwj196diipjlc"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; @@ -133562,33 +134220,6 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.7.1"; - sha256 = "1nny63rd9bw7ijg9l09cd467whfaa1n3ph8dqdy7bp6kcbvdwnzn"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - base containers doctest raw-strings-qq tasty tasty-hunit - template-haskell time - ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_7_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, raw-strings-qq - , scientific, tagged, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; version = "1.7.1.1"; sha256 = "15qzlbgnplxc53l5134igf6yplxg4fgblx0s8bl8hfjh0gbnn8x8"; isLibrary = true; @@ -133605,7 +134236,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -136906,6 +137536,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) wirelesstools;}; + "ix" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck + , tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "ix"; + version = "0.1.0.0"; + sha256 = "135ksmyzk6d4sgw7na08cav56667hvlnpcvx14a5mf0ap89s63mg"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + description = "Indexed monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ix-shapable" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -136974,6 +137620,8 @@ self: { pname = "ixset-typed"; version = "0.4.0.1"; sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8"; + revision = "1"; + editedCabalFile = "0kfklsbjn4gmx76vl7vm1s149f13h2p537930yaq8s2671lzc79p"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -137441,6 +138089,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "javascript-bridge" = callPackage + ({ mkDerivation, aeson, base, binary, containers, scotty, stm, text + , time, transformers, wai, wai-extra, wai-websockets, websockets + }: + mkDerivation { + pname = "javascript-bridge"; + version = "0.2.0"; + sha256 = "13k7rkvmgm3ajhjvxlkkbipsbkx01lbjwq2xgfyygbcb0lccjrd9"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary containers stm text time transformers wai + wai-websockets websockets + ]; + executableHaskellDepends = [ base scotty text ]; + testHaskellDepends = [ aeson base scotty stm text time wai-extra ]; + description = "Remote Monad for JavaScript on the browser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "javascript-extras" = callPackage ({ mkDerivation, base, deepseq, ghcjs-base-stub, newtype-generics , parallel, text @@ -137880,8 +138549,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "joint"; - version = "0.1.1"; - sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp"; + version = "0.1.2"; + sha256 = "0v646rwk7anvfxdj7bz9wann1gahcpfsmvsrkk5zbkjx0bw6pibv"; libraryHaskellDepends = [ base ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; @@ -139523,8 +140192,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.6.0"; - sha256 = "1ipy0vy0pr9pbxjin0d86dwvdy70wxb1cmg1bqcdjdgrg2xbqxf8"; + version = "0.7.0"; + sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -140956,8 +141625,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "key"; - version = "0.1.1.0"; - sha256 = "15n53kq13hhc659s1hq9wdr530da3h2mg5psncq1d2snkkdswqxf"; + version = "0.1.2.0"; + sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k"; libraryHaskellDepends = [ base transformers ]; description = "Type-safe unconstrained dynamic typing"; license = stdenv.lib.licenses.bsd3; @@ -141327,18 +141996,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "kind-generics-th_0_2_0_0" = callPackage - ({ mkDerivation, base, kind-generics, template-haskell + "kind-generics-th_0_2_1_0" = callPackage + ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction }: mkDerivation { pname = "kind-generics-th"; - version = "0.2.0.0"; - sha256 = "1vj2zbkv51fvcpjrkqqlsd685drnh2yalsplcb6sgrgq9dfdlw2h"; + version = "0.2.1.0"; + sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb"; libraryHaskellDepends = [ - base kind-generics template-haskell th-abstraction + base ghc-prim kind-generics template-haskell th-abstraction ]; - testHaskellDepends = [ base kind-generics ]; + testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -141509,8 +142178,8 @@ self: { }: mkDerivation { pname = "knit-haskell"; - version = "0.6.0.1"; - sha256 = "0wsbi614sjn62ri4msdmav7kx9k11h35dkjpxsd2ndvky2njzi33"; + version = "0.7.0.0"; + sha256 = "06p802fx328hkl3d9rnbdvlmhh9fyx2l293hg65z5ad96c9xzwas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html @@ -143165,6 +143834,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_8_3" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.8.3"; + sha256 = "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath pretty + process syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -143823,22 +144511,17 @@ self: { }) {}; "language-nix" = callPackage - ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens - , pretty, QuickCheck + ({ mkDerivation, base, deepseq, lens, parsec-class, pretty + , QuickCheck }: mkDerivation { pname = "language-nix"; - version = "2.1.0.1"; - sha256 = "1kqsw0hk03wdn7mszyjgi38nxk1wmhbxfv6di3irrhsaf807657h"; - revision = "1"; - editedCabalFile = "1zv12p4ralrks0517zs52rzmzmsxxkcxkqz7zijfgcsvh6bsmafi"; + version = "2.2.0"; + sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx"; libraryHaskellDepends = [ - base base-compat Cabal deepseq lens pretty QuickCheck - ]; - testHaskellDepends = [ - base base-compat Cabal deepseq doctest lens pretty QuickCheck + base deepseq lens parsec-class pretty QuickCheck ]; - description = "Data types and useful functions to represent and manipulate the Nix language"; + description = "Data types and functions to represent the Nix language"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -144788,8 +145471,8 @@ self: { pname = "lazy-hash"; version = "0.1.0.0"; sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa"; - revision = "2"; - editedCabalFile = "0j46blbddl9y4chccyns7cixbxb0a4pkmdkbd5z09510ddz3jqm3"; + revision = "3"; + editedCabalFile = "0l348ahsic2cd27haqgsbh35w1f1y92bf2jnb8hkvbwf04b7r4qw"; libraryHaskellDepends = [ base constrained-categories hashable haskell-src-meta tagged template-haskell vector-space @@ -144809,8 +145492,8 @@ self: { pname = "lazy-hash-cache"; version = "0.1.0.0"; sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4"; - revision = "1"; - editedCabalFile = "1m42wsj93vpb6v1dcj2lc5z04qc2np8i7n3w82jwwk4wbgl5q35j"; + revision = "2"; + editedCabalFile = "1w1g6h01pjvrqk3r0qknn0v0xidfdnbwm6kqvxax89r83i29pkv5"; libraryHaskellDepends = [ base base16-bytestring binary bytestring data-default-class directory filepath hashable lazy-hash microlens microlens-th @@ -144839,6 +145522,8 @@ self: { pname = "lazy-io-streams"; version = "0.1.0.0"; sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; + revision = "1"; + editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; @@ -144846,6 +145531,22 @@ self: { broken = true; }) {}; + "lazy-priority-queue" = callPackage + ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: + mkDerivation { + pname = "lazy-priority-queue"; + version = "0.1.0.1"; + sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base doctest lens ]; + testToolDepends = [ markdown-unlit ]; + description = "Lazy-Spined Monadic Priority Queues"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -145569,7 +146270,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "lens_4_18" = callPackage + "lens_4_18_1" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , Cabal, cabal-doctest, call-stack, comonad, containers , contravariant, criterion, deepseq, directory, distributive @@ -145583,8 +146284,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.18"; - sha256 = "0wldr36bmlxddc6d874lfl4hwnh5bq5k89v437d7xw5ldj0fgws6"; + version = "4.18.1"; + sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -145630,8 +146331,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2.3"; - sha256 = "1q4q190lv6gh3bvdz9n177hwrckkkbfbwcw64b9ksz11gxn8m106"; + version = "0.2.4"; + sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids @@ -145929,6 +146630,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-regex-pcre_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy + , template-haskell, text + }: + mkDerivation { + pname = "lens-regex-pcre"; + version = "1.0.0.0"; + sha256 = "02am0q60nhn93jlrxskcc33mcgn0la8y4074vv0rbxxshbxz6k4h"; + libraryHaskellDepends = [ + base bytestring lens pcre-heavy template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec lens pcre-heavy template-haskell text + ]; + benchmarkHaskellDepends = [ + base bytestring gauge lens pcre-heavy template-haskell text + ]; + description = "A lensy interface to regular expressions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, mtl, transformers @@ -146462,8 +147185,8 @@ self: { pname = "libarchive"; version = "1.0.5.1"; sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; - revision = "4"; - editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d"; + revision = "5"; + editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -148225,8 +148948,8 @@ self: { }: mkDerivation { pname = "lingo"; - version = "0.1.0.1"; - sha256 = "1yany2pi06yvkmgz808gji6yk9v0wbl5vnaijhb8vqd152zmmzb4"; + version = "0.2.0.0"; + sha256 = "0wgrliwxgwsylga3hkikpjyf7a835n7y62kihj6glymim2xv1vdw"; setupHaskellDepends = [ base bytestring Cabal containers directory filepath text yaml ]; @@ -148370,8 +149093,8 @@ self: { }: mkDerivation { pname = "linnet"; - version = "0.4.0.0"; - sha256 = "0k64pnzs13rc68h4qpn0kd3qm3hsyzgd8d8r96vak8a0pbjkzgrq"; + version = "0.4.0.1"; + sha256 = "0bzss6a8fx8zw5q27m50nhqp8rb23v1cdxlck0hjr17h0fmxvwsm"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either exceptions http-media http-types mtl text time transformers @@ -148393,8 +149116,8 @@ self: { }: mkDerivation { pname = "linnet-aeson"; - version = "0.4.0.0"; - sha256 = "1rpc3i32vywvhfndg9p3rd5qy1m1fv0zqxbhdyp36c8awm1q5086"; + version = "0.4.0.1"; + sha256 = "0lsrn9sxcr038vz7j112hmf5mc2027x808ndqxm4dx4m6ncji0a4"; libraryHaskellDepends = [ aeson base bytestring linnet ]; testHaskellDepends = [ aeson base bytestring hspec linnet QuickCheck quickcheck-classes @@ -148411,8 +149134,8 @@ self: { }: mkDerivation { pname = "linnet-conduit"; - version = "0.4.0.0"; - sha256 = "1a29sahlmhl8k6xqyfm9ixf64k2x0k631z5jixvg1x1s6xpq3hyi"; + version = "0.4.0.1"; + sha256 = "02ixcf0b1p2c7cyiaghx564lkyy2m48m8p1y6dxim9ygjgamhhl9"; libraryHaskellDepends = [ base bytestring conduit http-types linnet wai warp ]; @@ -148651,11 +149374,11 @@ self: { ({ mkDerivation, base, bytestring, containers, hashable }: mkDerivation { pname = "lio"; - version = "0.11.6.0"; - sha256 = "1lylxwcm0j9iyivi11h6wsq6xb4fn8k5bpbjj3694kcdby9b8hr6"; + version = "0.11.7.0"; + sha256 = "17ckrv1ksm2ab91x63h5ia65hckw0zcxfr2mdl6aa2xxscnm4k8h"; libraryHaskellDepends = [ base bytestring containers hashable ]; description = "Labeled IO Information Flow Control Library"; - license = "GPL"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -149571,8 +150294,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1.1"; - sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6"; + version = "3.8.1.2"; + sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -150670,6 +151393,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_6" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.6"; + sha256 = "1bcc7m2r4hhl03s91qixfc5w26pbdb7hy9dp6lzdahw6q7pn0hkw"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -151438,6 +152185,19 @@ self: { broken = true; }) {}; + "louis" = callPackage + ({ mkDerivation, base, bytestring, JuicyPixels, text, vector }: + mkDerivation { + pname = "louis"; + version = "0.1.0.2"; + sha256 = "0bw07idhhnyxfsry5qq8hs5fdbp810j7i2syd1vfqdsbm2krq816"; + libraryHaskellDepends = [ + base bytestring JuicyPixels text vector + ]; + description = "Turning images into text using Braille font"; + license = stdenv.lib.licenses.mit; + }) {}; + "loup" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, lifted-async, lifted-base, optparse-generic, preamble @@ -152270,6 +153030,35 @@ self: { broken = true; }) {}; + "lzip" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "lzip"; + version = "0.0.0.0"; + sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7"; + libraryHaskellDepends = [ base bytestring ]; + description = "Lzip compression / Lzlib bindings"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "lzlib" = callPackage + ({ mkDerivation, base, bytestring, c2hs, criterion, directory + , filepath, hspec, temporary + }: + mkDerivation { + pname = "lzlib"; + version = "0.2.0.1"; + sha256 = "0cp33l990na6wz9yb0kx2nzq3hqxpyc7s47xg0bvia8sajrkzdw6"; + libraryHaskellDepends = [ base bytestring ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring directory hspec ]; + benchmarkHaskellDepends = [ + base bytestring criterion filepath temporary + ]; + description = "lzlib bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lzma" = callPackage ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty , tasty-hunit, tasty-quickcheck @@ -152353,8 +153142,8 @@ self: { pname = "lzma-streams"; version = "0.1.0.0"; sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn"; - revision = "3"; - editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r"; + revision = "4"; + editedCabalFile = "02ipx7mf8mfc937wkdid6qkxxkb2qp7sx9g8bkk8wbvma77kkysg"; libraryHaskellDepends = [ base bytestring io-streams lzma ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -154341,6 +155130,19 @@ self: { broken = true; }) {}; + "marshal-contt" = callPackage + ({ mkDerivation, base, bytestring, kan-extensions, lens, mtl }: + mkDerivation { + pname = "marshal-contt"; + version = "0.2.0.0"; + sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; + libraryHaskellDepends = [ + base bytestring kan-extensions lens mtl + ]; + description = "A ContT-based wrapper for Haskell-to-C marshalling functions"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "marvin" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, configurator , deepseq, directory, filepath, hashable, haskeline, hspec @@ -154465,29 +155267,9 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "massiv-io" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq, directory - , filepath, JuicyPixels, massiv, netpbm, process, vector - }: - mkDerivation { - pname = "massiv-io"; - version = "0.1.6.0"; - sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; - libraryHaskellDepends = [ - base bytestring data-default deepseq directory filepath JuicyPixels - massiv netpbm process vector - ]; - description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-io_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , directory, filepath, JuicyPixels, massiv, netpbm, process, vector }: @@ -154501,8 +155283,6 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "massiv-scheduler" = callPackage @@ -154544,8 +155324,6 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "master-plan" = callPackage @@ -154659,27 +155437,6 @@ self: { }: mkDerivation { pname = "math-functions"; - version = "0.3.2.0"; - sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base data-default-class deepseq erf HUnit primitive QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - vector vector-th-unbox - ]; - description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_2_1" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit - , primitive, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; version = "0.3.2.1"; sha256 = "1d1zgc9y3pgahpkn2vgzc2vh412z54i03gw98s95jpqclvl7fyck"; libraryHaskellDepends = [ @@ -154692,7 +155449,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "math-grads" = callPackage @@ -155042,8 +155798,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.4.0"; - sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb"; + version = "50200.5.0"; + sha256 = "0ahlsyk21zm0h1ri0jwlhmqv90myn8x5xhjhpqxafsyjj8vhanpw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156064,6 +156820,8 @@ self: { pname = "membrain"; version = "0.0.0.0"; sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498"; + revision = "1"; + editedCabalFile = "1nkphzar8f1wyif3haz6i55jaapysz1xvf2w3ynmm49ibhsczvg3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hedgehog hspec type-spec @@ -156207,6 +156965,8 @@ self: { pname = "meminfo"; version = "0.2.0.0"; sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x"; + revision = "1"; + editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Library for reading `/proc/meminfo`"; license = stdenv.lib.licenses.bsd3; @@ -156446,8 +157206,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "3"; - editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37"; + revision = "4"; + editedCabalFile = "1bx3xrafmf82b9wlvhggv87fwqgpgqxjdgkk9r5b323m9ci2gign"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156483,6 +157243,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mergeful" = callPackage + ({ mkDerivation, aeson, base, containers, mtl, text, time, validity + , validity-containers, validity-time + }: + mkDerivation { + pname = "mergeful"; + version = "0.0.0.0"; + sha256 = "1zvli3gqw5svr5k36yl420ih2x8drl1522khn8jmjp9n26hc080w"; + libraryHaskellDepends = [ + aeson base containers mtl text time validity validity-containers + validity-time + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "mergeless" = callPackage ({ mkDerivation, aeson, base, containers, mtl, time, validity , validity-containers, validity-time @@ -158762,6 +159537,17 @@ self: { broken = true; }) {}; + "mm2" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "mm2"; + version = "0.1.1.0"; + sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3"; + libraryHaskellDepends = [ base vector ]; + description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations"; + license = stdenv.lib.licenses.mit; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -160518,10 +161304,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.9"; - sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; - revision = "1"; - editedCabalFile = "1vxd4ncwbg77vvny77b771lbh0xjdwim3lmpd14zcfqqpy0gn9bj"; + version = "3.10"; + sha256 = "18vvcq6s9aci314daqkniq9aj1wdqa7rd3v06vd506a98c7lwp31"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -161116,8 +161900,10 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.0.0"; - sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + version = "1.0.1.0"; + sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9"; + revision = "1"; + editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv"; libraryHaskellDepends = [ base math-functions vector vector-th-unbox ]; @@ -162356,8 +163142,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.5.0.1"; - sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs"; + version = "0.6.0.0"; + sha256 = "1ijaxamabxwabyvh30blscxxgpbmr55far373nhn98w224b1jddy"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -165343,6 +166129,8 @@ self: { pname = "natural"; version = "0.3.0.4"; sha256 = "0c5z5msb2nx648m07cjv9hwaycdhcwis9ac6n7qbyvhxsis84jlg"; + revision = "1"; + editedCabalFile = "1jn15nmrnkdwi1k76n5ghlazx3lqhacy5cxpkbqa8ypmwpx3i7jn"; libraryHaskellDepends = [ base lens semigroupoids ]; testHaskellDepends = [ base checkers hedgehog lens QuickCheck tasty tasty-hedgehog @@ -165927,29 +166715,31 @@ self: { }) {ghc-binary = null;}; "net-mqtt" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, bytestring - , conduit, conduit-extra, containers, HUnit, network-conduit-tls - , network-uri, QuickCheck, stm, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary + , bytestring, conduit, conduit-extra, containers, HUnit + , network-conduit-tls, network-uri, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "net-mqtt"; - version = "0.2.4.2"; - sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj"; + version = "0.5.1.0"; + sha256 = "0wqrzp39d9c04j1lqsk8kn727bymcq8jk12v330l527lm5g76adj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls network-uri stm text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers network-conduit-tls network-uri QuickCheck + stm text ]; executableHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls network-uri stm text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers network-conduit-tls network-uri QuickCheck + stm text ]; testHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers HUnit network-conduit-tls network-uri QuickCheck stm - tasty tasty-hunit tasty-quickcheck text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers HUnit network-conduit-tls network-uri + QuickCheck stm tasty tasty-hunit tasty-quickcheck text ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; @@ -166754,8 +167544,8 @@ self: { ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; - version = "0.1.1.0"; - sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk"; + version = "0.1.1.1"; + sha256 = "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -166988,6 +167778,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-manager-tui" = callPackage + ({ mkDerivation, base, brick, hspec, microlens, process, split + , vector, vty + }: + mkDerivation { + pname = "network-manager-tui"; + version = "1.0.0.0"; + sha256 = "15xm6nsinf1a33h9wd06s7z8fvydn0jck6rzc5v69g51fdy8mjbg"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base brick microlens process split vector vty + ]; + executableHaskellDepends = [ + base brick microlens process split vector vty + ]; + testHaskellDepends = [ + base brick hspec microlens process split vector vty + ]; + doHaddock = false; + description = "network-manager tui"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-messagepack-rpc" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions , text, unordered-containers @@ -167865,8 +168679,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "newtype"; - version = "0.2.1.0"; - sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb"; + version = "0.2.2.0"; + sha256 = "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; @@ -167891,24 +168705,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups - , transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.5.3"; - sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; - revision = "1"; - editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_5_4" = callPackage ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups , transformers }: @@ -167922,7 +168718,6 @@ self: { benchmarkHaskellDepends = [ base gauge semigroups ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -167943,6 +168738,21 @@ self: { broken = true; }) {}; + "newtype-zoo" = callPackage + ({ mkDerivation, base, data-default, deepseq, pointed, profunctors + , QuickCheck, random + }: + mkDerivation { + pname = "newtype-zoo"; + version = "1.1.0.0"; + sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp"; + libraryHaskellDepends = [ + base data-default deepseq pointed profunctors QuickCheck random + ]; + description = "Newtype Wrapper Zoo"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "newtyper" = callPackage ({ mkDerivation, base, Kleislify, newtype }: mkDerivation { @@ -171527,36 +172337,6 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7004.0"; - sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m"; - revision = "1"; - editedCabalFile = "0wxcygykflm06v7m0p3pi7i490c1mjbid8whc9dsc181hfzhr6wl"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time time-locale-compat - transformers uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_7004_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void - }: - mkDerivation { - pname = "opaleye"; version = "0.6.7004.1"; sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; libraryHaskellDepends = [ @@ -171573,7 +172353,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -172935,14 +173714,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-applicative_0_15_0_0" = callPackage + "optparse-applicative_0_15_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, process , QuickCheck, transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.15.0.0"; - sha256 = "0210rv7scp2063n8pr39bzy7dbl2777zwdnnx6kp3c34jilssjxg"; + version = "0.15.1.0"; + sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -173628,29 +174407,26 @@ self: { }) {}; "otp-authenticator" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, bytestring + ({ mkDerivation, aeson, base, base-compat, binary, bytestring , containers, cryptonite, dependent-sum, filepath, h-gpgme - , haskeline, microlens, one-time-password, optparse-applicative - , sandi, singletons, text, time, transformers, trifecta - , type-combinators, unix, uri-encode, witherable, yaml + , haskeline, megaparsec, microlens, optparse-applicative, sandi + , text, time, transformers, unix, uri-encode, vinyl, yaml }: mkDerivation { pname = "otp-authenticator"; - version = "0.1.0.1"; - sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm"; + version = "0.1.1.0"; + sha256 = "0hmyq7ris01gnkydxi9i2p5v2c5cps4mg4zmxbzlyjrkyn7d5la4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bifunctors binary bytestring containers cryptonite - dependent-sum filepath h-gpgme haskeline microlens - one-time-password optparse-applicative sandi singletons text time - transformers trifecta type-combinators unix uri-encode witherable - yaml + aeson base base-compat binary bytestring containers cryptonite + dependent-sum filepath h-gpgme haskeline megaparsec microlens + optparse-applicative sandi text time transformers unix uri-encode + vinyl yaml ]; executableHaskellDepends = [ aeson base binary bytestring h-gpgme text yaml ]; - testHaskellDepends = [ base ]; description = "OTP Authenticator (a la google) command line client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -173726,20 +174502,20 @@ self: { "overloaded" = callPackage ({ mkDerivation, base, bytestring, containers, fin, generic-lens - , ghc, HUnit, lens, sop-core, split, syb, symbols, tasty - , tasty-hunit, text, vec + , ghc, HUnit, lens, singleton-bool, sop-core, split, syb, symbols + , tasty, tasty-hunit, text, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.1"; - sha256 = "0sb910gk8z3a97vqk9naa079sm84p24jh2jgm39lxagwhmz72w6a"; + version = "0.1.1"; + sha256 = "0palmwxknrc5pqwhlij3rfbzfz9csi5h41iild89bxkb3qj0x2z4"; libraryHaskellDepends = [ base bytestring containers fin ghc sop-core split syb symbols text - vec + time vec ]; testHaskellDepends = [ - base bytestring containers fin generic-lens HUnit lens sop-core - symbols tasty tasty-hunit text vec + base bytestring containers fin generic-lens HUnit lens + singleton-bool sop-core symbols tasty tasty-hunit text time vec ]; description = "Overloaded pragmas as a plugin"; license = stdenv.lib.licenses.bsd3; @@ -176876,6 +177652,8 @@ self: { pname = "path-io"; version = "1.4.2"; sha256 = "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3"; + revision = "1"; + editedCabalFile = "02irjcw5rdcx9wvsb7mcanylp2bwaiacpfjjbcvqq1lhvqcyw73i"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -176887,6 +177665,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-io_1_5_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.5.0"; + sha256 = "16zgi2a7g3mc9rslshjm86q4c3rr9vrd8qcjw753ndpar05j41bf"; + revision = "1"; + editedCabalFile = "127x8jhx2illj2r5x8f2g4yfl1idfngxmzphfr45abdf024n3pm8"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions hspec path transformers unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-pieces" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { @@ -178079,14 +178879,14 @@ self: { }) {}; "perceptual-hash" = callPackage - ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip - , hspec, optparse-applicative, par-traverse, primitive, repa, stm - , vector, vector-algorithms + ({ mkDerivation, base, containers, cpphs, criterion, deepseq + , filepath, hip, hspec, optparse-applicative, par-traverse + , primitive, repa, stm, vector, vector-algorithms }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.2.0"; - sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r"; + version = "0.1.3.0"; + sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178097,7 +178897,7 @@ self: { base containers filepath optparse-applicative par-traverse stm ]; testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion filepath ]; + benchmarkHaskellDepends = [ base criterion deepseq filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = stdenv.lib.licenses.bsd3; @@ -180445,8 +181245,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.4.1"; - sha256 = "1a0lw43pjfz18aplm2frljwaww37pm2ashxi59j6l5n32lg5573j"; + version = "1.0.5"; + sha256 = "042zph3nisrmhkfk2h3fwh91dz1fp0wgff0hlnpd962i67fgpixx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180456,8 +181256,6 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pinch" = callPackage @@ -182912,8 +183710,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.5"; - sha256 = "1h5igixmn36k9b4mnc7lgalc4i88yg71h396wzqnh041jz28y6wc"; + version = "1.1.1.6"; + sha256 = "1rsr9vgqq10ydwan2qvghgfvff5m75ivl8md8r8yxffbw0spiwsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182959,10 +183757,8 @@ self: { }: mkDerivation { pname = "pointful"; - version = "1.0.11.0"; - sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; - revision = "2"; - editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0"; + version = "1.1.0.0"; + sha256 = "1a6fy2m3cv1jn399vgl467nhc8vwlfcqly1mbzh5rjlsy7drjj3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183386,7 +184182,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "polysemy_1_2_0_0" = callPackage + "polysemy_1_2_1_0" = callPackage ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover , inspection-testing, mtl, stm, syb, template-haskell @@ -183395,8 +184191,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.2.0.0"; - sha256 = "14cl4h78vhi83c3ccz3hy1cbh21a7ry7n5z2i7m3zm2cyj4sbw4q"; + version = "1.2.1.0"; + sha256 = "0apwnscl6falazh8w8vv7zm2rv60ls8syk06swjicm4vwxj7zdl4"; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb template-haskell th-abstraction transformers type-errors @@ -183425,8 +184221,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.3.0.0"; - sha256 = "17qh2p7nh091kgywdzfd8ckzk6vczm9zxyp9vs94c1ld9qxrhkv8"; + version = "0.4.0.0"; + sha256 = "0l4jimvd3shvxwl0zrfxqp3hlkiqwzihljd07jdppchc41xq3aiz"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -183488,15 +184284,15 @@ self: { broken = true; }) {}; - "polysemy-zoo_0_6_0_0" = callPackage + "polysemy-zoo_0_6_0_1" = callPackage ({ mkDerivation, async, base, binary, bytestring, constraints , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover , mtl, polysemy, polysemy-plugin, random, reflection, transformers }: mkDerivation { pname = "polysemy-zoo"; - version = "0.6.0.0"; - sha256 = "1d8h1hmq59b4igxdym83rd4ggcq45jb5zb0sdyvacqiicy5rnzhz"; + version = "0.6.0.1"; + sha256 = "1va72282ng2h15fpzi3az1cdl1717hyfsa1qfz9xl4lnaa4x8nwa"; libraryHaskellDepends = [ async base binary bytestring constraints containers contravariant ghc-prim hedis mtl polysemy polysemy-plugin random reflection @@ -184208,6 +185004,23 @@ self: { broken = true; }) {}; + "posplyu" = callPackage + ({ mkDerivation, base, directory, process, split, time, timerep + , transformers, unix, X11 + }: + mkDerivation { + pname = "posplyu"; + version = "0.1.0"; + sha256 = "1whdihlfcgjy4na86qhhhixa0l494005shfxs5ns61qsdw7mwflk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory process split time timerep transformers unix X11 + ]; + description = "Sleep tracker for X11, using XScreenSaver extension and manual input"; + license = stdenv.lib.licenses.mit; + }) {}; + "possible" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -184471,6 +185284,8 @@ self: { pname = "postgresql-libpq"; version = "0.9.4.2"; sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f"; + revision = "1"; + editedCabalFile = "0hilyfb2gjh471ia2g8mwjs56ykrgl0qd06vpigwhc493ia7a9mv"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -184605,8 +185420,8 @@ self: { pname = "postgresql-simple"; version = "0.6.2"; sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "1"; - editedCabalFile = "0v8a7ylnbl8iv6v3blahrsnggk3kldvrq2gpq1fxni8y2jmc96d6"; + revision = "2"; + editedCabalFile = "1rlawj79mfff915bz5fr62g5ig4pfh77m30xrq8q71s6ql0ly4bj"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -184794,8 +185609,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "1"; - editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp"; + revision = "2"; + editedCabalFile = "1nb1ks6hdfn16389f2yhf37qhjqd2y5wjc1dcp9bjhzd787z7ypr"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -186318,8 +187133,8 @@ self: { pname = "prettyprinter"; version = "1.3.0"; sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; - revision = "1"; - editedCabalFile = "0i5m6x3xsph343w2902xvv91l1raak4nz4q1py7vf95p0hbb72qq"; + revision = "2"; + editedCabalFile = "044zsw0fykrf657s60wrn2798g6b3phis1d32f92zrrq7y2nscw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -186899,6 +187714,20 @@ self: { broken = true; }) {}; + "print-console-colors" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "print-console-colors"; + version = "0.1.0.0"; + sha256 = "12x1lbn8daq996pipnqd8g6mjpg85zj85zygbs547m9r27gf6j88"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + executableHaskellDepends = [ base ]; + description = "Print all ANSI console colors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "print-debugger" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -187747,16 +188576,17 @@ self: { , hashable, hashable-time, haskeline, http-api-data, http-types , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl , network, network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, QuickCheck - , quickcheck-instances, random, random-shuffle, resourcet, rset - , scotty, semigroups, stm, stm-containers, template-haskell - , temporary, text, time, transformers, unix, unordered-containers - , uuid, vector, vector-binary-instances, websockets, zlib + , optparse-applicative, parallel, parser-combinators, path-pieces + , QuickCheck, quickcheck-instances, random, random-shuffle + , resourcet, rset, scotty, semigroups, stm, stm-containers + , template-haskell, temporary, text, time, transformers, unix + , unordered-containers, uuid, vector, vector-binary-instances + , websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.6"; - sha256 = "0ajxsgzbscg45c1dzhqassnga9k3i22f2l2w5kciina5q43ihla4"; + version = "0.7"; + sha256 = "1ahvnyrg28r16rw982bpawrmiikc121z7358y3gxzqxnv2cc9y65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187779,9 +188609,9 @@ self: { deepseq-generics directory either filepath ghc ghc-paths gnuplot hashable hashable-time haskeline http-api-data http-types HUnit list-t megaparsec MonadRandom mtl network-transport-tcp - optparse-applicative parallel path-pieces random scotty semigroups - stm stm-containers template-haskell temporary text time - transformers unordered-containers uuid vector + optparse-applicative parallel parser-combinators path-pieces random + scotty semigroups stm stm-containers template-haskell temporary + text time transformers unordered-containers uuid vector vector-binary-instances websockets ]; testHaskellDepends = [ @@ -187790,8 +188620,8 @@ self: { directory either filepath gnuplot hashable hashable-time haskeline http-api-data HUnit list-t megaparsec MonadRandom mtl network network-transport network-transport-tcp optparse-applicative - parallel path-pieces random semigroups stm stm-containers - template-haskell temporary text time transformers + parallel parser-combinators path-pieces random semigroups stm + stm-containers template-haskell temporary text time transformers unordered-containers uuid vector vector-binary-instances websockets ]; benchmarkHaskellDepends = [ @@ -188046,8 +188876,8 @@ self: { }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.1.0"; - sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9"; + version = "0.1.2.0"; + sha256 = "0lia1r6bjh0m55s7nrfhn76v58yai8brlpi0q193wh0ypsg71j9l"; libraryHaskellDepends = [ base directory filepath prometheus-client regex-applicative text unix unix-memory @@ -188766,8 +189596,8 @@ self: { }: mkDerivation { pname = "protocol-radius-test"; - version = "0.1.0.0"; - sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + version = "0.1.0.1"; + sha256 = "14npn49vj7a66pzvrdw0gj88h97vz11axq5i4k4nq0r156yb07pm"; libraryHaskellDepends = [ base bytestring cereal containers protocol-radius QuickCheck quickcheck-simple transformers @@ -189604,8 +190434,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.2.0.0"; - sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61"; + version = "0.3.0.0"; + sha256 = "0c2qmw29pbnh5kz9pkl7h4gvcs0nc671y2pjfdj3vsj0av3xqz9n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189969,8 +190799,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.9"; - sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3"; + version = "1.5.1.10"; + sha256 = "0nif5b7slyr7ppm1igm06k1zjf0sninyrf0n8qkaw2kwhxgdsam2"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -191174,7 +192004,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_6_3_0" = callPackage + "quickcheck-classes_0_6_4_0" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers , contravariant, fail, primitive, primitive-addr, QuickCheck , quickcheck-classes-base, semigroupoids, semigroups, semirings @@ -191182,10 +192012,8 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.3.0"; - sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf"; - revision = "1"; - editedCabalFile = "1qm6zfmhil1wn1972hfdsvxlgzgps0ip8vdlgz3fz5a048l29ahq"; + version = "0.6.4.0"; + sha256 = "0qcxmkf9ig6jnfpd5slx2imzwmvvyqgvlif2940yzwam63m6anwg"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers contravariant fail primitive primitive-addr QuickCheck quickcheck-classes-base @@ -193010,6 +193838,27 @@ self: { broken = true; }) {}; + "rank2classes_1_3_1" = callPackage + ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty + , tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.3.1"; + sha256 = "07ykacy93c1rgh9a5ndkkhaviyfr61xfhi430rpwamk4h6i6qiy3"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + testToolDepends = [ markdown-unlit ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -194467,6 +195316,38 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reanimate_0_1_6_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base + , base64-bytestring, bytestring, cassava, colour, containers + , cubicbezier, diagrams, diagrams-contrib, diagrams-core + , diagrams-lib, diagrams-svg, directory, filepath, fsnotify + , hashable, here, JuicyPixels, lens, linear, matrices, matrix, mtl + , open-browser, palette, parallel, process, QuickCheck + , random-shuffle, reanimate-svg, svg-builder, tasty, tasty-golden + , tasty-hunit, temporary, text, time, vector, websockets, xml + }: + mkDerivation { + pname = "reanimate"; + version = "0.1.6.0"; + sha256 = "10nivxmj8lkvr7g8fjnq7m7kxy3jmy9vka0lva6ahr91c9qk1fcz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava + colour containers cubicbezier diagrams diagrams-contrib + diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify + hashable here JuicyPixels lens linear matrices matrix mtl + open-browser palette parallel process random-shuffle reanimate-svg + svg-builder temporary text time vector websockets xml + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring directory filepath process + QuickCheck tasty tasty-golden tasty-hunit + ]; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reanimate-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, hspec , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text @@ -194474,8 +195355,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.1.0"; - sha256 = "1hiinaz8swlg1lzm5narlwmkzqjxym4k3qn5izyhjjhx4ch0avr4"; + version = "0.9.1.1"; + sha256 = "1y2q6nljgs4h05ga0v713z5bcjd8xrxvg6sf81di65rhdkksidx7"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -194487,15 +195368,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_9_1_1" = callPackage + "reanimate-svg_0_9_2_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, hspec , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text , transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.1.1"; - sha256 = "1y2q6nljgs4h05ga0v713z5bcjd8xrxvg6sf81di65rhdkksidx7"; + version = "0.9.2.1"; + sha256 = "018jkgiry2yaq7nl8sks4ahjdx5pjgdj99gc6k4l3rfmd1zxvsng"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -195338,13 +196219,13 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4.2.2"; - sha256 = "1gdfhmj8f1abxflxmqyfibz0hdaayr932f04vchygdvdb812av60"; + version = "0.4.3"; + sha256 = "1x6rz5hy6rnn46fjh20ppbkdaj3cn5bnlapbnvsw5h6s3bdic7p5"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell transformers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest QuickCheck ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -197063,16 +197944,17 @@ self: { }) {}; "releaser" = callPackage - ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-pcre + ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa + , regex-tdfa-text, text }: mkDerivation { pname = "releaser"; - version = "0.1.0.0"; - sha256 = "04icyx42ya7l4h5923yji0170c3xl0gg9lvcmswh7lmrg8x9gvip"; + version = "0.2.0.0"; + sha256 = "1hh4z87rc11pgapbrz0sjcy21pvgnm201b85prn09kiwcqrawz8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-pcre + base Cabal pretty-terminal process regex-tdfa regex-tdfa-text text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; @@ -197775,8 +198657,8 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.0.0.0"; - sha256 = "0cyaqdlhjmpmw51h8k93gi21d1wkyajd2zyzfk787kg8hby0hkzi"; + version = "1.0.1.0"; + sha256 = "12xwdaqi81ssc5536icl49bqdnc6hiss9xm4gx3m1m4nz70ivk6z"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text @@ -197784,25 +198666,63 @@ self: { benchmarkHaskellDepends = [ attoparsec base bytestring criterion text ]; - description = "Stream editing with Attoparsec"; + description = "Stream edit, find-and-replace with Attoparsec parsers"; license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_0_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion + , parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.0.2.0"; + sha256 = "13fri1sqvr9ldzbr7wif4fn5phjmca3pql10qzx049gyip1vfy8a"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Stream edit, find-and-replace with Attoparsec parsers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec , text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.1.2.0"; - sha256 = "154abc29xhc8qz3ilzrpnjn3a43rbiq7b60k4agv7zmsllihb0kk"; + version = "1.1.3.0"; + sha256 = "0nh14fk3wwwli9hh2wfj02zrgcsf0hia14cx22g9qvlym53ljg50"; + libraryHaskellDepends = [ base megaparsec ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + benchmarkHaskellDepends = [ + base bytestring criterion megaparsec text + ]; + description = "Stream edit, find-and-replace with Megaparsec parsers"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "replace-megaparsec_1_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec + , text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.1.4.0"; + sha256 = "0mfxk03p6wwikyrra2r5zs06axl7v0da9ggv5ycd6mi4bc5hpj8r"; libraryHaskellDepends = [ base megaparsec ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec text ]; - description = "Stream editing with parsers"; + description = "Stream edit, find-and-replace with Megaparsec parsers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replica" = callPackage @@ -198168,6 +199088,38 @@ self: { broken = true; }) {}; + "require_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, inliterate + , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum + }: + mkDerivation { + pname = "require"; + version = "0.4.3"; + sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + text universum + ]; + executableHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + text universum + ]; + testHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + tasty tasty-hspec text universum + ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory inliterate megaparsec + optparse-generic text universum + ]; + description = "Scrap your qualified import clutter"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rerebase" = callPackage ({ mkDerivation, rebase }: mkDerivation { @@ -199374,6 +200326,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine_0_5_1_1" = callPackage + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, time, transformers, vector-sized + }: + mkDerivation { + pname = "rhine"; + version = "0.5.1.1"; + sha256 = "1f7sgdlnjf25znhnjdcq7yibxcfnjq7cldl6z9ydmg62az839ms2"; + libraryHaskellDepends = [ + base containers deepseq dunai free MonadRandom random time + transformers vector-sized + ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhine-gloss" = callPackage ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { @@ -202282,6 +203251,8 @@ self: { pname = "safecopy"; version = "0.9.4.3"; sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq"; + revision = "1"; + editedCabalFile = "060yxbk2fy5gddnpf6kxppc9fwkhiyldm39bj7873wggnpdc2xds"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -202295,6 +203266,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy_0_10_0" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , generic-data, HUnit, lens, lens-action, old-time, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.10.0"; + sha256 = "0j5fa68symjqwphvin0nj524wnh3vmq34mlj6mfvl78by4pki0nv"; + libraryHaskellDepends = [ + array base bytestring cereal containers generic-data old-time + template-haskell text time transformers vector + ]; + testHaskellDepends = [ + array base bytestring cereal containers HUnit lens lens-action + QuickCheck quickcheck-instances tasty tasty-quickcheck + template-haskell time vector + ]; + description = "Binary serialization with version control"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra , haskell-src-meta, microlens, safecopy, template-haskell @@ -203594,6 +204589,8 @@ self: { pname = "scanner"; version = "0.3"; sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57"; + revision = "1"; + editedCabalFile = "1v64k5jn70ipv2yi81b0s8lkpdd8hx08gdix0ixnpfqdpkj7pzx2"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec ]; benchmarkHaskellDepends = [ @@ -203603,6 +204600,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scanner_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion + , fail, hspec, text + }: + mkDerivation { + pname = "scanner"; + version = "0.3.1"; + sha256 = "1mhqh94qra08zidqfsq0gxi83cgflqldnk9rr53haynbgmd5y82k"; + libraryHaskellDepends = [ base bytestring fail ]; + testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring cereal criterion text + ]; + description = "Fast non-backtracking incremental combinator parsing for bytestrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scanner-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }: mkDerivation { @@ -203769,8 +204784,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "schedyield" = callPackage @@ -205276,6 +206289,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell_0_1_5" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck + , secp256k1, string-conversions + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.1.5"; + sha256 = "1s989dk7zncz68zl3k13dk8ap7dq5k4m2kwimpbicizxfnl7gzfg"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable + QuickCheck string-conversions + ]; + librarySystemDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable hspec + HUnit mtl QuickCheck string-conversions + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) secp256k1;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -205283,8 +206320,8 @@ self: { }: mkDerivation { pname = "secp256k1-legacy"; - version = "0.5.4"; - sha256 = "1sm0w29iwlhd1596h4x8dcqv5jz0jk6vfc41iqikdhgbn89xv6sd"; + version = "0.5.5"; + sha256 = "1wqzv26zcbd9lxl8ifwwwnp7ikfd7rs8w784gdap963yk0k3692d"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base16-bytestring bytestring cereal entropy mtl QuickCheck @@ -205430,6 +206467,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , random, text, time, uuid-types + }: + mkDerivation { + pname = "selda"; + version = "0.5.0.0"; + sha256 = "1dsyc69fvqqhq9a9n97dnp81vvxxpf4dg4f5yan3fdr7zn9qgx3f"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl random text time + uuid-types + ]; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-json" = callPackage ({ mkDerivation, aeson, base, bytestring, selda, text }: mkDerivation { @@ -205443,6 +206497,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-json_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, selda, text }: + mkDerivation { + pname = "selda-json"; + version = "0.1.1.0"; + sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8"; + libraryHaskellDepends = [ aeson base bytestring selda text ]; + description = "JSON support for the Selda database library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-binary , postgresql-libpq, selda, selda-json, text, time, uuid-types @@ -205621,6 +206687,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "semantic-source" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , generic-monoid, hashable, hedgehog, QuickCheck, semilattices + , tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "semantic-source"; + version = "0.0.0.0"; + sha256 = "1zvqr8a5pm32hcwxxgnbyp773ld4c29m20v7hghcmkgfdayps5r1"; + libraryHaskellDepends = [ + aeson base bytestring deepseq generic-monoid hashable semilattices + text + ]; + testHaskellDepends = [ + base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit + text + ]; + description = "Types and functionality for working with source code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "semaphore-plus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -205906,14 +206995,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_5" = callPackage + "semirings_0_5_1" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.5"; - sha256 = "1xfmb017jjlas0lq4969d1dw7wifsym8m2qnadz7bywhjl96kzxh"; + version = "0.5.1"; + sha256 = "1nrz80hsc3sx7nhd1hd17pdhdxhlvc2ngkg8jy14r2y2fblxczgd"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers ]; @@ -206323,8 +207412,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.4.0.1"; - sha256 = "1inw4agbm722zjbxi1ys73pssx76k8pg1s3cyxl5v1czqlyjxppy"; + version = "1.4.1"; + sha256 = "1162qvpaj8zs1510pkq9v6pdny51r0r5bhwnpmrv1a6c8vm723n3"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -206348,8 +207437,8 @@ self: { }: mkDerivation { pname = "sequenceTools"; - version = "1.4.0.2"; - sha256 = "1s6g5n9rb9yk2rzjc2dvmw14ncjfrf66lkla8bcacdvqwa8hl7kr"; + version = "1.4.0.4"; + sha256 = "13q9ypr4zxbxj0allkahcc4syvvmmplv2d3qj3mcz1p7704klga0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206636,6 +207725,8 @@ self: { pname = "servant"; version = "0.16.2"; sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n"; + revision = "1"; + editedCabalFile = "0v913vjklgwyfbn7k2v70943gy4i8ja3y6crpyrg5llxkb81jpbc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -207072,8 +208163,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "5"; - editedCabalFile = "1hidradrcdcchbr0hn9y7y1bc0i0gxzfbganyy7p2z8ip2czddvj"; + revision = "6"; + editedCabalFile = "17d6phknxh5cqslwcj3a4gfhsgm8bw4bf7mlpmfrrc6izwnm1q8v"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -207172,8 +208263,38 @@ self: { pname = "servant-client"; version = "0.16"; sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; - revision = "2"; - editedCabalFile = "0xdrs79farfhw12azl9jmkwvqslassnrjqvbgz0xjnnqnb0b9l86"; + revision = "4"; + editedCabalFile = "0fa37fdas1dsgd6qkc5wzi9683l5xzzq1i705l3adiwkdfkcbjjf"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server stm + tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-client_0_16_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.16.0.1"; + sha256 = "1w6rw1bdm5x8swi9dy70n86gq9v85wlgmm6pglfxqbv7bgzpql8c"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -207189,6 +208310,7 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-core" = callPackage @@ -207201,8 +208323,8 @@ self: { pname = "servant-client-core"; version = "0.16"; sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; - revision = "1"; - editedCabalFile = "1hanl8sz14z11441ng8vkzpxrl6igk3xzp6fcm6wg59fsb30fh29"; + revision = "2"; + editedCabalFile = "172diqnz0ddvlfznfjk0k1l02f1mb11i1dkzr6rizdmhb66qpqil"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -207246,8 +208368,8 @@ self: { pname = "servant-conduit"; version = "0.15"; sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; - revision = "1"; - editedCabalFile = "0l6pv8bqca88k8wjx7qczagka6l99zd7xyz1ma95004665gc56x6"; + revision = "2"; + editedCabalFile = "1m5h5kwc9bjpc7ppdsxx8rr4906bl08np1kawzfvpr7qqy4s8j4q"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -207376,6 +208498,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-docs_0_11_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.4"; + sha256 = "1z35rr55mxwi761pmqy176liglms443ynk0sjh8v8hcyfciymq0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -207447,6 +208598,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-elm_0_7_0" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec + , HUnit, lens, servant, servant-client, servant-foreign, text + , wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.7.0"; + sha256 = "1nnxz61hvrhjkkljpv445ib17ncpb0sp4hdaf7mqjrffr2yb155l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory elm-bridge lens servant servant-foreign text + wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-bridge hspec HUnit servant servant-client text + ]; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-examples" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, either , http-types, js-jquery, lucid, random, servant, servant-client @@ -207525,8 +208699,8 @@ self: { pname = "servant-foreign"; version = "0.15"; sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; - revision = "1"; - editedCabalFile = "1amvhixa0zwjipmv6iv97pfzlr83p0b0kvxif2d2l7akcdgd2ddz"; + revision = "2"; + editedCabalFile = "0axz78g0vhasq5cvqg1lq0b2qanmb768f1bvzbfx58rn6arwflnj"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -207710,6 +208884,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_16_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.16.0.1"; + sha256 = "0nfwi8bnafv78lzxxi56i9pyk2rj0vkl5x193fixirw4fjvia3zg"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -207783,8 +208992,8 @@ self: { pname = "servant-js"; version = "0.9.4"; sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; - revision = "1"; - editedCabalFile = "09nd1wlpaj20pyp6jzp2hsnyl02lvbi5vvvymhfhqf3rjxxpnyyr"; + revision = "2"; + editedCabalFile = "1x7f0dbqgzlwzmr20l6hln4s86kblak4j9h0p9igcqibmplc70zn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207832,8 +209041,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; - revision = "2"; - editedCabalFile = "17p1xxzmr3ya0k4cy9n5mqf356gm35jdcm8mw1cxg2v80sd6nr4j"; + revision = "3"; + editedCabalFile = "10j29y9zjflh88csvn7zi4pm8jr9dxsglin94wypjrhcwy7yj1ic"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -207849,8 +209058,8 @@ self: { pname = "servant-machines"; version = "0.15"; sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; - revision = "2"; - editedCabalFile = "0x7dw8mcvgaag53ai5c9nagc5dik4r06wxdhvp72q8f09pvabxxf"; + revision = "3"; + editedCabalFile = "10ifc1r10lmzvrxa79389bz5ydcmacyz8ga4x63fw7r1rbfml0jz"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -207908,8 +209117,8 @@ self: { pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; - revision = "2"; - editedCabalFile = "0269d0yr8sa043wc2ymg3fv60c9pr4jxfy9sar2qqccvngpa1vf5"; + revision = "3"; + editedCabalFile = "1137vz9xm8iwj6x8h1q1yify6c1lahy0dxj6hpbhgi4s3mqkhm2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207938,8 +209147,8 @@ self: { pname = "servant-multipart"; version = "0.11.4"; sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; - revision = "1"; - editedCabalFile = "0sf5vmzdcfzy01d65dd2f5l4k67znmjvp86d4xgkrmqsqmgxcgpg"; + revision = "2"; + editedCabalFile = "0pr0crsxc9m6p06m5qk39gzvqnj3hcxql0almpjfag0ifpviwkgk"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai @@ -208069,8 +209278,29 @@ self: { pname = "servant-pipes"; version = "0.15"; sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90"; - revision = "1"; - editedCabalFile = "1q4w4fnvpi4m62yhv37pcg5sj21m4s02glsa5q56vc51bjbx8xi4"; + revision = "2"; + editedCabalFile = "0c3nyj2iwmhd3kmyv4q0ilzcwxr2dsg5lxvysbhh8048q90bm1nw"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-pipes_0_15_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.1"; + sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -208081,6 +209311,7 @@ self: { ]; description = "Servant Stream support for pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -208221,6 +209452,8 @@ self: { pname = "servant-quickcheck"; version = "0.0.7.4"; sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf"; + revision = "1"; + editedCabalFile = "1k2qcfg8vh8nj3j621hsi09q3lj6p9ahz7rgz89psm79j9ks10d9"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -208395,6 +209628,8 @@ self: { pname = "servant-server"; version = "0.16.2"; sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80"; + revision = "1"; + editedCabalFile = "017aw6wyhi5g7zkk59yj44r1n02zzin2w9wdskwqys7iqkvnvczn"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -208530,8 +209765,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.2.0"; - sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v"; + version = "0.2.2.1"; + sha256 = "15i5sgi30m5y8capc10k4hsaldzglvmknfq6sr1mrrzc9z9c3lrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208680,6 +209915,8 @@ self: { pname = "servant-swagger"; version = "1.1.7.1"; sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild"; + revision = "1"; + editedCabalFile = "1wymxb7vi55rhk4kfbrxxv9dsxlxlam70mi9ldwnxp4xdf91ja2p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -208722,6 +209959,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.4.3.22.2"; sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm"; + revision = "1"; + editedCabalFile = "084cqli1d30vz6mrj6l9cxlwmigqqiydkxdq90xvz3ffhs5cyq8p"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208739,6 +209978,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.3"; sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; + revision = "1"; + editedCabalFile = "07i6bcy0z1xa2m7cdaq37wi20plghrppbd1v58a1g23g54mf0dcm"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -208756,6 +209997,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.3"; sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw"; + revision = "1"; + editedCabalFile = "0876wqw08fd39k4hc1739gf727ryq2w2w3sxvc89hp31zc2hm0fi"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208772,6 +210015,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.3.1.22.2"; sha256 = "0qkh4h5ijhizlnps79gg75jy533rpc1vcw7v7yxika585srndim1"; + revision = "1"; + editedCabalFile = "1qi389fjrlnqbsm7kw6rbyga19mw9286g5ibavi888jqyllpmi8f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208883,8 +210128,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; - revision = "2"; - editedCabalFile = "0scpm5dshnb7izn1xx8q3xm1m5f52y1s7nzgp7sa7zcv3pp6n7lw"; + revision = "3"; + editedCabalFile = "1qq4sg2kmdh45f4cjf36ldkdmhzryd5npy5yp558snbks0358wgs"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -209008,8 +210253,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.10"; - sha256 = "1gvswqkdk5awnvjqzvhbrvdmsyj73kiph872fvplmmdyvq8hb8gy"; + version = "0.8.11"; + sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -209024,8 +210269,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "serversession" = callPackage @@ -209487,6 +210730,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.9"; + sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv"; + revision = "1"; + editedCabalFile = "01i087l8v129q90jf09khaw5p4iqix5s17gzgfz2pbi030zhb82h"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to setlocale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -210408,8 +211665,8 @@ self: { }: mkDerivation { pname = "shakespeare-sass"; - version = "0.1.0.3"; - sha256 = "169jkazw4567hcm2gnlpa6jgkz7bn5b83nr0fkqf2bm72zq2g4hl"; + version = "0.1.4.1"; + sha256 = "0y4z898dkmkmvfv1lhsq5rgsda5dz6ginvp62hmshbml8yg8hps7"; libraryHaskellDepends = [ base hsass shakespeare template-haskell yesod yesod-core ]; @@ -210975,8 +212232,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.5"; - sha256 = "119b9rvvdsw1al0i4lqa25z7ykwwqi46xz22az1b8fi3xiijprs3"; + version = "0.7.0.6"; + sha256 = "0whcynzjsm0agq456kv6dn6d4gk1k3vhvnbwvjar4sbn0yiz4if1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210993,8 +212250,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shh-extras" = callPackage @@ -211007,8 +212262,6 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shift" = callPackage @@ -211234,6 +212487,8 @@ self: { pname = "show-combinators"; version = "0.1.1.0"; sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; + revision = "1"; + editedCabalFile = "1zr6xw4fvgx187yiqy7n0r9mnasyv1hxg2q9xzw3lmsf4z3xz6y7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -211833,8 +213088,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.2"; - sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8"; + version = "0.1.3"; + sha256 = "09cp664flacsq565pqva7vsqcq5ddndck4rh74y6n2j3xzl24a2k"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -212378,8 +213633,8 @@ self: { ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }: mkDerivation { pname = "simple-sql-parser"; - version = "0.5.0"; - sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd"; + version = "0.6.0"; + sha256 = "11jpqh00nfdldpanrcy01jd6xyg4xvz3b8g4csc8kswc47wff82i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -213147,6 +214402,32 @@ self: { broken = true; }) {}; + "sized-grid_0_2_0_1" = callPackage + ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad + , constraints, distributive, generics-sop, HUnit, lens + , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, vector, vector-space + }: + mkDerivation { + pname = "sized-grid"; + version = "0.2.0.1"; + sha256 = "15js3x76bz9p38bxk355kpp8aq0ns68yxqnc64bp956wqss69vgi"; + libraryHaskellDepends = [ + adjunctions aeson base comonad constraints distributive + generics-sop lens mtl random vector vector-space + ]; + testHaskellDepends = [ + adjunctions aeson ansi-terminal base comonad distributive + generics-sop HUnit lens markdown-unlit QuickCheck tasty tasty-hunit + tasty-quickcheck vector vector-space + ]; + testToolDepends = [ markdown-unlit ]; + description = "Multidimensional grids with sized specified at compile time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sized-types" = callPackage ({ mkDerivation, array, base, base-compat, containers, singletons }: @@ -213754,21 +215035,18 @@ self: { }) {}; "slick" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, lens - , lens-aeson, mustache, pandoc, shake, text, time + ({ mkDerivation, aeson, base, bytestring, directory, extra + , mustache, pandoc, shake, text, unordered-containers }: mkDerivation { pname = "slick"; - version = "0.2.0.0"; - sha256 = "0pxbrqykf11nrdc6zyjxvfc57dfajp5nm4qpqyk26l2jh1gaklz7"; + version = "1.0.0.0"; + sha256 = "11wzfgxx5cjdkwgs23afidvjck8q8vs4p2qm7g9f2zxiq6706y89"; libraryHaskellDepends = [ - aeson base binary bytestring containers lens lens-aeson mustache - pandoc shake text time - ]; - testHaskellDepends = [ - aeson base binary bytestring containers lens lens-aeson mustache - pandoc shake text time + aeson base bytestring directory extra mustache pandoc shake text + unordered-containers ]; + description = "A quick & easy static site builder built with shake and pandoc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213928,6 +215206,37 @@ self: { broken = true; }) {}; + "slynx" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix + , integration, lens, math-functions, matrices, megaparsec + , monad-logger, mwc-random, optparse-applicative, parallel + , primitive, statistics, text, transformers, vector + , vector-th-unbox, word8 + }: + mkDerivation { + pname = "slynx"; + version = "0.0.1"; + sha256 = "1wwzgslhbdn5q5sd9706sbz2zjqk6dhch72jb43cqbfh4jkfr8r1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-seq + elynx-tools elynx-tree hmatrix integration lens math-functions + matrices megaparsec monad-logger mwc-random optparse-applicative + parallel primitive statistics text transformers vector + vector-th-unbox word8 + ]; + executableHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-seq + elynx-tools hmatrix integration lens math-functions matrices + megaparsec monad-logger mwc-random optparse-applicative parallel + primitive statistics text transformers vector vector-th-unbox word8 + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, byteslice, bytestring, gauge , natural-arithmetic, primitive, primitive-offset, QuickCheck @@ -216654,6 +217963,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "some" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "some"; + version = "1.0.0.3"; + sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base ]; + description = "Existential type: Some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sonic-visualiser" = callPackage ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl , pretty, utf8-string, xml @@ -217273,8 +218594,8 @@ self: { }: mkDerivation { pname = "sparse-tensor"; - version = "0.2.1.1"; - sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y"; + version = "0.2.1.2"; + sha256 = "0rkq0la7l12x9ck96ra8inlz81fcj5z8sxa90sgd082jhrq7jq94"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ ad base bytestring cereal containers deepseq ghc-typelits-knownnat @@ -218490,6 +219811,8 @@ self: { pname = "sqlite-simple"; version = "0.4.16.0"; sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0"; + revision = "1"; + editedCabalFile = "123bykwxl3p6918bjxv073ksf8k1hn6s0rlph934h18400n51fdf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers direct-sqlite Only semigroups template-haskell text time @@ -220339,6 +221662,34 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "statistics_0_15_1_1" = callPackage + ({ mkDerivation, aeson, async, base, base-orphans, binary + , data-default-class, deepseq, dense-linear-algebra, erf, HUnit + , ieee754, math-functions, monad-par, mwc-random, primitive + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms + , vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.15.1.1"; + sha256 = "015rn74f1glii26j4b2fh1fc63xvxzrh2xckiancz48kc8jdzabj"; + libraryHaskellDepends = [ + aeson async base base-orphans binary data-default-class deepseq + dense-linear-algebra math-functions monad-par mwc-random primitive + vector vector-algorithms vector-binary-instances vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf HUnit ieee754 + math-functions mwc-random primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -222068,6 +223419,22 @@ self: { broken = true; }) {}; + "streaming-events" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, http-client + , streaming, streaming-attoparsec, streaming-bytestring, wai-extra + }: + mkDerivation { + pname = "streaming-events"; + version = "1.0.0"; + sha256 = "12rbw1gvcfl2svlsm7x1v01j9bk0fdh6x7j1c0v6a9xjmwq2bgv6"; + libraryHaskellDepends = [ + attoparsec base binary bytestring http-client streaming + streaming-attoparsec streaming-bytestring wai-extra + ]; + description = "Client-side consumption of a ServerEvent"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-eversion" = callPackage ({ mkDerivation, base, doctest, foldl, microlens, pipes , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit @@ -222548,23 +223915,6 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , semigroupoids, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; - version = "0.1.4"; - sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz"; - libraryHaskellDepends = [ base semigroupoids ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Strict linked list"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strict-list_0_1_5" = callPackage ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck }: @@ -222579,7 +223929,6 @@ self: { ]; description = "Strict linked list"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-tuple" = callPackage @@ -223931,8 +225280,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "4"; - editedCabalFile = "1vjk95n2wqybigy8p55gs7qkiv5v1lwf8qmri1f9bk29599sh74k"; + revision = "5"; + editedCabalFile = "1fy1d12rq8cqafyr0yvwsnslmmvdhpjigjv2ppvhs4ihgghrrij3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224558,6 +225907,8 @@ self: { pname = "svfactor"; version = "0.1"; sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35"; + revision = "1"; + editedCabalFile = "1ffm727zmg402s0v2mbcxjng6b0s1idci6x01njfw4s6zwl144fv"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring charset deepseq lens parsec parsers semigroupoids semigroups text transformers trifecta @@ -224827,6 +226178,8 @@ self: { pname = "swagger2"; version = "2.4"; sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci"; + revision = "1"; + editedCabalFile = "02qlfsgqc5jmc616xn30hn213dwhsqlkrrk2pa6774f0dcn8rpiz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers cookie @@ -225352,8 +226705,8 @@ self: { }: mkDerivation { pname = "symbiote"; - version = "0.0.0"; - sha256 = "1p38lblwd8cxbypnqy7f71ab2s7ia00xv6ysy24lh9xaqns43ad4"; + version = "0.0.0.1"; + sha256 = "06341y9bfr6h9sf7llxm2zc36q0zabn2ildp0gyskspybibl1sdy"; libraryHaskellDepends = [ aeson async base bytestring cereal containers monad-control mtl QuickCheck stm text @@ -226519,8 +227872,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.4"; - sha256 = "160ns7fd3xivlfirir7lk0ghv1f63b6cyfvnk8p2cn3jjfdp9xb3"; + version = "0.8.0.5"; + sha256 = "1gvajqjw5i2l97zcx607xlc143xq1sli5i1321msgi585h7ksnd4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227852,6 +229205,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.1"; sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"; + revision = "1"; + editedCabalFile = "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -230671,16 +232026,19 @@ self: { }) {}; "text-format-heavy" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default, parsec - , text, time + ({ mkDerivation, base, bytestring, containers, data-default, hspec + , labels, parsec, template-haskell, text, th-lift + , th-lift-instances, time }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.2"; - sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5"; + version = "0.1.5.3"; + sha256 = "00fz6s190jpqffx2i89rbmmc7959gh70bk3w8wcflcxkzcmf3wiv"; libraryHaskellDepends = [ - base bytestring containers data-default parsec text time + base bytestring containers data-default labels parsec + template-haskell text th-lift th-lift-instances time ]; + testHaskellDepends = [ base hspec time ]; description = "Full-weight string formatting library, analog of Python's string.format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -231978,6 +233336,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-printf_0_7" = callPackage + ({ mkDerivation, base, charset, containers, dlist, hspec, HUnit + , integer-logarithms, microlens-platform, mtl, parsec, QuickCheck + , semigroups, template-haskell, text, th-lift, transformers + }: + mkDerivation { + pname = "th-printf"; + version = "0.7"; + sha256 = "1f9lw0scm2bpnhmhgvywzphxn85ln3xcn8cjyvy8h4cn2ymw4aza"; + libraryHaskellDepends = [ + base charset containers dlist integer-logarithms microlens-platform + mtl parsec semigroups template-haskell text th-lift transformers + ]; + testHaskellDepends = [ + base hspec HUnit QuickCheck template-haskell text + ]; + description = "Quasiquoters for printf"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -232813,6 +234192,24 @@ self: { broken = true; }) {}; + "thumbnail-polish" = callPackage + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, friday, friday-devil, nonce, resourcet, text + }: + mkDerivation { + pname = "thumbnail-polish"; + version = "0.0.1.0"; + sha256 = "09b5689anqbll8x7mwcwbcm5qwsxvayglfk3k3p55jwp142z75ir"; + libraryHaskellDepends = [ + base bytestring data-default directory filepath friday friday-devil + nonce resourcet text + ]; + description = "Image thumbnail creation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "thyme" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , containers, cpphs, criterion, deepseq, directory, filepath, mtl @@ -232889,6 +234286,8 @@ self: { pname = "tibetan-utils"; version = "0.1.1.10"; sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia"; + revision = "1"; + editedCabalFile = "0gm271p3m3y0x9lfi5yviznqfr65f0if553z6h977dqk3f3psyfd"; libraryHaskellDepends = [ base composition-prelude megaparsec text ]; @@ -234484,6 +235883,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tlynx" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-seq + , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec + , monad-logger, mwc-random, optparse-applicative, parallel + , primitive, QuickCheck, quickcheck-instances, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.0.1"; + sha256 = "0acgwn0czk3kpsnsrlkmxrm7cc0mv6wwx75nr5v3hc1ir1hais6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers elynx-seq elynx-tools elynx-tree + lifted-async math-functions megaparsec monad-logger mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics text transformers vector + ]; + executableHaskellDepends = [ + base bytestring containers elynx-tools elynx-tree lifted-async + math-functions megaparsec monad-logger mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics text transformers vector + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -236692,18 +238120,18 @@ self: { "tree-sitter" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, fused-effects, hedgehog, hspec, split, template-haskell - , text, unordered-containers + , filepath, fused-effects, hedgehog, split, template-haskell, text + , unordered-containers }: mkDerivation { pname = "tree-sitter"; - version = "0.2.0.0"; - sha256 = "03xdyvmnpjswh0rkn718n1w8kqvly86s6k3cwqgb6r1ygd6kqmim"; + version = "0.3.0.0"; + sha256 = "1ai587a8m67j0rjg1gbhxnv1kl4awpcr7jvh4qnlvx91g7s1gq2g"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects - hedgehog split template-haskell text unordered-containers + split template-haskell text unordered-containers ]; - testHaskellDepends = [ base hedgehog hspec ]; + testHaskellDepends = [ base hedgehog ]; description = "Unstable bindings for the tree-sitter parsing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -236714,10 +238142,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-go"; - version = "0.1.0.0"; - sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag"; - revision = "1"; - editedCabalFile = "04cq0vlwk4b0kyjsdc8aykm2m173wxzlvm3pjwfshcg2d5kqcn8a"; + version = "0.2.0.0"; + sha256 = "1yrhn025rdllfcmlcaiz6idxhxqh02qjpw71dm3zynmnmgmpqcc0"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Go"; @@ -236730,10 +238156,10 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-haskell"; - version = "0.1.0.0"; - sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m"; + version = "0.2.0.0"; + sha256 = "0cds6xmps88vx3x7ifkpjbbbgvnbc22hxam6qdwy2m1njbff3wad"; revision = "1"; - editedCabalFile = "0326iz5r9bz4qsmqpiih1h28hbr10lhfy810b4p1bwianj7735bp"; + editedCabalFile = "07kgsp70bwggcnxh9229dvbfysc9s4ykzir4973pn02qs5l7kb6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base template-haskell tree-sitter ]; @@ -236748,10 +238174,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-java"; - version = "0.1.0.0"; - sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr"; - revision = "1"; - editedCabalFile = "07b2pwnfn2smaq4x9zhh721r2vqf8ipcgr3m19s9bnsyd7pbqyiy"; + version = "0.2.0.0"; + sha256 = "1gayg7ln4iy56a4pl3dqrl2iq689b1a8z2n59dnrhmzhq87lzx7y"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Java"; @@ -236764,10 +238188,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.1.0.0"; - sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3"; - revision = "1"; - editedCabalFile = "14gyys09392bf46vnhv4skc817ghka0bbqzrzr6lamaszk9a02ax"; + version = "0.2.0.0"; + sha256 = "0x30pwmganjabzkgqgrkk249r8v4frag9ww64j4sfq6r2vbfc7l3"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for JSON"; @@ -236780,8 +238202,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-php"; - version = "0.1.0.1"; - sha256 = "1wbslim9ps3pf29445cxjr5kb4haidb43zl3a87pk5gfbr2wj0r0"; + version = "0.2.0.0"; + sha256 = "0wdyppjp879wb3m73kczsa78c0lyqvpnkvsh13bh22vw66jypj6x"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for PHP"; @@ -236796,8 +238218,8 @@ self: { }: mkDerivation { pname = "tree-sitter-python"; - version = "0.2.0.0"; - sha256 = "1grkz8i3d37cci1w4i1lvdr2bjp7ddhq1fbyf240132rbhx67pg8"; + version = "0.4.0.0"; + sha256 = "02i12ys845j4n0j7a1qpdlbx9ia51m7ab9lhk7d4028ysx82crn9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath template-haskell tree-sitter @@ -236814,10 +238236,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-ruby"; - version = "0.1.0.0"; - sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9"; - revision = "1"; - editedCabalFile = "0vwhd6g77s0y0wxflsfvhxcb4hg527nm0h92xxkxk3f50rf2rp0z"; + version = "0.2.0.0"; + sha256 = "0n2ls3mkinqv0h2h05pmi8scmgr70bpg3pdg9wnid1gdpcwn07qx"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Ruby"; @@ -236830,10 +238250,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.1.0.0"; - sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma"; - revision = "1"; - editedCabalFile = "0hfghgxa138m4krml12yf9s3zqnad14ryynzmyqdwb9j25302hb6"; + version = "0.2.1.0"; + sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; @@ -236846,10 +238264,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.1.0.0"; - sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn"; - revision = "1"; - editedCabalFile = "0ahjxiz4jgym12490xmh2vsyvxly5gza01aasxblncf1h2q1nggi"; + version = "0.2.1.0"; + sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; @@ -237620,6 +239036,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ttl-hashtables_1_4_0_0" = callPackage + ({ mkDerivation, base, clock, containers, data-default, failable + , hashable, hashtables, hspec, mtl, transformers + }: + mkDerivation { + pname = "ttl-hashtables"; + version = "1.4.0.0"; + sha256 = "0s8ia8sd3j5k05gv57agbxar6bnpigwcy53ypz3j3pml90sdm820"; + libraryHaskellDepends = [ + base clock containers data-default failable hashable hashtables mtl + transformers + ]; + testHaskellDepends = [ + base clock containers data-default failable hashable hashtables + hspec mtl transformers + ]; + description = "Extends hashtables so that entries added can be expired after a TTL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ttn" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations , raw-strings-qq, text, time, timerep @@ -237854,8 +239291,8 @@ self: { ({ mkDerivation, base, type-combinators }: mkDerivation { pname = "tuple-ops"; - version = "0.0.0.2"; - sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp"; + version = "0.0.0.3"; + sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax"; libraryHaskellDepends = [ base type-combinators ]; description = "various operations on n-ary tuples via GHC.Generics"; license = stdenv.lib.licenses.bsd3; @@ -238046,6 +239483,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_15" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, fail + , foldl, hostname, managed, optional-args, optparse-applicative + , process, semigroups, stm, streaming-commons, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.15"; + sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm streaming-commons + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ + base doctest fail system-filepath temporary + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -238851,6 +240316,8 @@ self: { pname = "type-combinators"; version = "0.2.4.3"; sha256 = "1xip4gav1fn3ip62mrlbr7p6i1254fa1q542cmp6ffzm55lwn30z"; + revision = "1"; + editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w"; libraryHaskellDepends = [ base ]; description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; @@ -240600,8 +242067,8 @@ self: { }: mkDerivation { pname = "unbound-kind-generics"; - version = "0.2.0.0"; - sha256 = "1hn78dixgd1p0pabh7pg0c7q607irs68vs3ggay8i1s72nc9lvj8"; + version = "0.2.1.0"; + sha256 = "01xfgjgjnv302dy4w7c8z727ppfr30f1h8y0vhxiy296rzzkdwfm"; libraryHaskellDepends = [ base kind-generics kind-generics-th unbound-generics ]; @@ -241542,10 +243009,8 @@ self: { }: mkDerivation { pname = "universe"; - version = "1.1"; - sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds"; - revision = "1"; - editedCabalFile = "0639gsf8irhpgcp69lq9l7987lsh4wnw3z9ai0dqrvx5ixpg3k5h"; + version = "1.1.1"; + sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg"; libraryHaskellDepends = [ universe-base universe-dependent-sum universe-instances-extended universe-reverse-instances @@ -241554,17 +243019,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "universe_1_1_1" = callPackage - ({ mkDerivation, universe-base, universe-dependent-sum - , universe-instances-extended, universe-reverse-instances + "universe_1_2" = callPackage + ({ mkDerivation, universe-base, universe-instances-extended + , universe-reverse-instances, universe-some }: mkDerivation { pname = "universe"; - version = "1.1.1"; - sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg"; + version = "1.2"; + sha256 = "0l8g583pgbklxgv7fjb1bdhf1a09wmj8fc59siknqwlankln84qs"; libraryHaskellDepends = [ - universe-base universe-dependent-sum universe-instances-extended - universe-reverse-instances + universe-base universe-instances-extended + universe-reverse-instances universe-some ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; @@ -241607,6 +243072,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-dependent-sum_1_2" = callPackage + ({ mkDerivation, base, dependent-sum, some, universe-base + , universe-some + }: + mkDerivation { + pname = "universe-dependent-sum"; + version = "1.2"; + sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07"; + libraryHaskellDepends = [ + base dependent-sum some universe-base universe-some + ]; + description = "Universe instances for types from dependent-sum"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-instances-base" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { @@ -241621,19 +243102,6 @@ self: { }) {}; "universe-instances-extended" = callPackage - ({ mkDerivation, adjunctions, base, comonad, universe-base }: - mkDerivation { - pname = "universe-instances-extended"; - version = "1.1"; - sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q"; - revision = "1"; - editedCabalFile = "02267na4xac77q4rnsy53h8nh0gfcmjzkb89qmi4qmvpps8h15y5"; - libraryHaskellDepends = [ adjunctions base comonad universe-base ]; - description = "Universe instances for types from selected extra packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-extended_1_1_1" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers , contravariant, universe-base }: @@ -241646,7 +243114,6 @@ self: { ]; description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-instances-trans" = callPackage @@ -241675,6 +243142,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-some" = callPackage + ({ mkDerivation, base, some, template-haskell, th-abstraction + , transformers, universe-base + }: + mkDerivation { + pname = "universe-some"; + version = "1.2"; + sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; + libraryHaskellDepends = [ + base some template-haskell th-abstraction transformers + universe-base + ]; + testHaskellDepends = [ base some template-haskell universe-base ]; + description = "Universe instances for Some from some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universe-th" = callPackage ({ mkDerivation, base, checkers, composition, DebugTraceHelpers , HUnit, mtl, QuickCheck, template-haskell, test-framework @@ -242578,17 +244062,16 @@ self: { }) {}; "urbit-hob" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, murmur3 - , text + ({ mkDerivation, base, bytestring, criterion, deepseq, hspec + , hspec-core, murmur3, QuickCheck, text, vector }: mkDerivation { pname = "urbit-hob"; - version = "0.1.0"; - sha256 = "01mrj3irlsqfxvswm00k893n6wybc6wxcqddd645wb9q5mpzdsqi"; - libraryHaskellDepends = [ - base bytestring cereal containers murmur3 text - ]; - testHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "00ldbja79h5alf1wwxvrsah9v8fxam47cm2ypap9sni4w9kan5gk"; + libraryHaskellDepends = [ base bytestring murmur3 text vector ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -244425,19 +245908,25 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck - , time, transformers + ({ mkDerivation, base, contravariant, criterion, doctest, hspec + , QuickCheck, time, transformers }: mkDerivation { pname = "varying"; - version = "0.7.1.1"; - sha256 = "03k41nik9nl3qqb4xrwfrqwc58wpdcdfmjls84fp140n2pwgd5av"; + version = "0.8.0.0"; + sha256 = "1m71aqa34p1f95mn0mlcm4wq12x5axwhrqnyg4wbxhaz2cmxj4yh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base contravariant transformers ]; - executableHaskellDepends = [ base time transformers ]; - testHaskellDepends = [ base hspec QuickCheck time transformers ]; - benchmarkHaskellDepends = [ base criterion time transformers ]; + executableHaskellDepends = [ + base contravariant time transformers + ]; + testHaskellDepends = [ + base contravariant doctest hspec QuickCheck time transformers + ]; + benchmarkHaskellDepends = [ + base contravariant criterion time transformers + ]; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; }) {}; @@ -245132,6 +246621,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_4_0_0" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.0.0"; + sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -245292,18 +246799,19 @@ self: { }) {}; "vega-view" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, directory - , filepath, http-types, scotty, text, unordered-containers + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , directory, filepath, http-types, scotty, text + , unordered-containers }: mkDerivation { pname = "vega-view"; - version = "0.2.0.2"; - sha256 = "0r9l77xx0bdrpn0jj432cdrw6xw9ni09f08n70kik57raay04bnq"; + version = "0.3.1.5"; + sha256 = "0f120aalldbcwyyjmm6chvqgyp70lifqbas7q442qqficw7yi6hg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base blaze-html bytestring directory filepath http-types - scotty text unordered-containers + aeson base blaze-html blaze-markup bytestring directory filepath + http-types scotty text unordered-containers ]; description = "Easily view Vega or Vega-Lite visualizations"; license = stdenv.lib.licenses.bsd3; @@ -245626,8 +247134,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.29"; - sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; + version = "0.0.0.30"; + sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245638,14 +247146,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_30" = callPackage + "viewprof_0_0_0_31" = callPackage ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.30"; - sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17"; + version = "0.0.0.31"; + sha256 = "0qw2r89ghyxcyzl360i3h0iwfgp1cmsb5pn0kw9nprqpa2flwfdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246504,8 +248012,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.8.0.0"; - sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h"; + version = "0.8.0.1"; + sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant @@ -248488,7 +249996,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_3_1" = callPackage + "warp_3_3_2" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -248498,8 +250006,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.1"; - sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn"; + version = "3.3.2"; + sha256 = "1sh1jp27azf8zdzhaqg5ab8mky4wgdacwd5cd9zrk3dbbarkf94i"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -248582,23 +250090,18 @@ self: { broken = true; }) {}; - "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, wai, warp - }: + "warp-systemd" = callPackage + ({ mkDerivation, base, network, systemd, unix, wai, warp }: mkDerivation { - pname = "warp-tls"; - version = "3.2.7"; - sha256 = "1h6m9jhvk4ai945p5s6sa9lxq40cn00gjfj4yiqhj2q5ymxfgfba"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; + pname = "warp-systemd"; + version = "0.1.0.0"; + sha256 = "1cfm70dapcxd7ddxs7x0qqlv5w5kr3hasspvg292ik5f5bn40m91"; + libraryHaskellDepends = [ base network systemd unix wai warp ]; + description = "Socket activation and other systemd integration for the Warp web server (WAI)"; + license = stdenv.lib.licenses.bsd3; }) {}; - "warp-tls_3_2_8" = callPackage + "warp-tls" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, wai, warp }: @@ -248612,7 +250115,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -249345,8 +250847,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "0.1.1"; - sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb"; + version = "0.1.3"; + sha256 = "1ry3cbi9awpxvj8f84b65ml9f73n5c1nw0ckc32hg55cq84yva9f"; libraryHaskellDepends = [ aeson base binary bytestring fast-logger formatting http-api-data http-types monad-logger protolude resourcet text unliftio @@ -250389,6 +251891,27 @@ self: { broken = true; }) {}; + "wide-word_0_1_0_9" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog + , primitive, QuickCheck, quickcheck-classes, semirings + }: + mkDerivation { + pname = "wide-word"; + version = "0.1.0.9"; + sha256 = "0k8v6iggsrbmmq82b4zziyg9arh6fvwqsfid15nnycdfgsaafph3"; + revision = "1"; + editedCabalFile = "1d9ahyjh7wjpr7llmvj2r7y6c0gl91yq501aj9c5qfpyhbc59jzl"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + base bytestring ghc-prim hedgehog primitive QuickCheck + quickcheck-classes semirings + ]; + description = "Data types for large but fixed width signed and unsigned integers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wigner-symbols" = callPackage ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive , random, vector @@ -250761,8 +252284,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.3"; - sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7"; + version = "0.2.5"; + sha256 = "13xdcn9fp1nc5378vmjbjwpw4n19bnnfrgr729yh5s366f2cfiv1"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -250790,6 +252313,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_3_4" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable, lens + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.4"; + sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6"; + libraryHaskellDepends = [ + base base-orphans containers hashable lens monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -251053,6 +252594,17 @@ self: { broken = true; }) {}; + "woe" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "woe"; + version = "0.1.0.3"; + sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b"; + libraryHaskellDepends = [ base ]; + description = "Convenient typeclass for defining arbitrary-index enums"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "woffex" = callPackage ({ mkDerivation, base, binary, bytestring, filepath, zlib }: mkDerivation { @@ -251536,7 +253088,7 @@ self: { base containers exceptions free spiros split text transformers ]; executableHaskellDepends = [ base ]; - description = "Automate keyboard\/mouse\/clipboard\/application interaction"; + description = "Automate keyboard/mouse/clipboard/application interaction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -254189,6 +255741,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "xmonad-contrib_0_16" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , extensible-exceptions, filepath, mtl, old-locale, old-time + , process, random, semigroups, unix, utf8-string, X11, X11-xft + , xmonad + }: + mkDerivation { + pname = "xmonad-contrib"; + version = "0.16"; + sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd"; + libraryHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + mtl old-locale old-time process random semigroups unix utf8-string + X11 X11-xft xmonad + ]; + description = "Third party extensions for xmonad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "xmonad-contrib-bluetilebranch" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions , mtl, old-locale, old-time, process, random, unix, utf8-string @@ -256915,28 +258488,6 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.6"; - sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; version = "1.6.7"; sha256 = "0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d"; libraryHaskellDepends = [ @@ -256948,7 +258499,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -260379,4 +261929,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zxcvbn-dvorak" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, binary-instances + , containers, lens, text, unordered-containers, zlib, zxcvbn-hs + }: + mkDerivation { + pname = "zxcvbn-dvorak"; + version = "0.1.0.0"; + sha256 = "07sz5vwgh7vxlr0z2v7bml8j2gy0l2pl62frgl8r211dzjmd7q8m"; + libraryHaskellDepends = [ + base base64-bytestring binary binary-instances containers lens text + unordered-containers zlib zxcvbn-hs + ]; + description = "Password strength estimation based on zxcvbn"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zxcvbn-hs" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , binary-instances, containers, criterion, fgl, hedgehog, lens + , math-functions, tasty, tasty-hedgehog, tasty-hunit, text, time + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "zxcvbn-hs"; + version = "0.2.0.0"; + sha256 = "1524j8mgvp26cz4n4cd1vyslniw0xbw9ngrgkcyj3jmkh6p53ngh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl lens math-functions text time unordered-containers + vector zlib + ]; + executableHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl lens math-functions text time unordered-containers + vector zlib + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl hedgehog lens math-functions tasty tasty-hedgehog + tasty-hunit text time unordered-containers vector zlib + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers criterion fgl lens math-functions text time + unordered-containers vector zlib + ]; + description = "Password strength estimation based on zxcvbn"; + license = stdenv.lib.licenses.mit; + }) {}; + } diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..9e1eeb75160 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch @@ -0,0 +1,24 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal +index e86713f11c..81c4cb7e48 100644 +--- a/amazonka.cabal ++++ b/amazonka.cabal +@@ -67,7 +67,7 @@ library + , conduit-extra >= 1.1 + , directory >= 1.2 + , exceptions >= 0.6 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.7 && < 3 + , http-types >= 0.8 + , ini >= 0.3.5 diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..d99072d79c6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch @@ -0,0 +1,26 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal +index 9796e007cf..eccb24e5bd 100644 +--- a/amazonka-core.cabal ++++ b/amazonka-core.cabal +@@ -90,7 +90,7 @@ library + , deepseq >= 1.4 + , exceptions >= 0.6 + , hashable >= 1.2 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.4 && < 3 + , http-types >= 0.8 && (<0.11 || >=0.12) + , lens >= 4.4 +-- +2.23.0 diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 197127d8b6d..d00e37733f2 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz"; + sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p"; }; nativeBuildInputs = [ meson ninja ]; - mesonFlags = ["-Dgit_hash=release"]; + mesonFlags = [ "-Dgit_hash=release" ]; doCheck = true; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index d179fb53178..80f19ab65f5 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,9 +1,5 @@ -{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }: -let - # workaround https://github.com/NixOS/nixpkgs/issues/37364 - jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk; -in { jogl_2_3_2 = let @@ -32,7 +28,8 @@ in -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; ''; - buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; + nativeBuildInputs = [ jdk ant git ]; + buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 1cc65b53b3e..6bfb80d3a17 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch , aws-c-common, aws-c-event-stream, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -50,6 +50,13 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; + patches = [ + (fetchpatch { + url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; + sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; + }) + ]; + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index cd16dea56b1..c7f94945570 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "4.17.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl"; + sha256 = "031kiawmrp40sqgd9g5qd82ljglcm9xvynicsn4n8n4ngfgbnc0m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index de31128e5a6..d9ea5a71dd3 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" + ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly" ; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch deleted file mode 100644 index c48eec68a64..00000000000 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Work around moc limitations - Some parts of Boost, introduced in Boost 1.48 are not - understood by the limited C++ parser of moc. This - patch defines header guards that prevent the troublesome boost - headers from being processed. -Bug-Debian: #653796 -Author: Tobias Frost <tobi@coldtobi.de> -Reviewed-By: Steve Robbins <smr@debian.org> - ---- a/src/QGlib/connect.h -+++ b/src/QGlib/connect.h -@@ -19,6 +19,11 @@ - #ifndef QGLIB_CONNECT_H - #define QGLIB_CONNECT_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ -+ - #include "global.h" - #include "quark.h" - #include <QtCore/QObject> ---- a/src/QGst/bin.h -+++ b/src/QGst/bin.h -@@ -19,6 +19,10 @@ - #ifndef QGST_BIN_H - #define QGST_BIN_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include "element.h" - #include "childproxy.h" - ---- a/src/QGst/Ui/videowidget.h -+++ b/src/QGst/Ui/videowidget.h -@@ -19,6 +19,10 @@ - #ifndef QGST_UI_VIDEOWIDGET_H - #define QGST_UI_VIDEOWIDGET_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include "global.h" - #include "../element.h" - #include <QtGui/QWidget> diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix deleted file mode 100644 index 9797f21c168..00000000000 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake -, automoc4, flex, bison, pkgconfig }: - -stdenv.mkDerivation rec { - name = "${pname}-0.10.3"; - pname = "qt-gstreamer"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; - sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; - }; - - buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost155 ]; - nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; - - cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - - patches = [ ./boost1.48.patch ]; -} diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix deleted file mode 100644 index a099643061a..00000000000 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake -, automoc4, flex, bison, pkgconfig }: - -stdenv.mkDerivation rec { - name = "${pname}-1.2.0"; - pname = "qt-gstreamer"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; - sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; - }; - - patches = [ - (fetchpatch { - url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088"; - sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s"; - }) - ]; - - outputs = [ "out" "dev" ]; - - buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost ]; - nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; - - cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 11fb21fe52e..d5cbbccba01 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light +, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch }: stdenv.mkDerivation rec { @@ -17,7 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; - patches = [ ./cross-build-nm-path.patch ]; + patches = [ ./cross-build-nm-path.patch ] ++ + lib.optionals stdenv.hostPlatform.isMusl [ + # Fix tests not building on musl because they use the glibc-specific + # (non-POSIX) `ioctl()` type signature. See #66441. + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch"; + sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by"; + }) + ]; postPatch = '' for a in */*-symbol-check ; do diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index b670172ce1e..5fefdad08e7 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; - sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1"; + sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 9ba3cdbd09a..558da91fcbf 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { }) ]; + outputs = [ "out" "dev" ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index c61053ff693..792a74da581 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Intel Processor Trace decoder library"; homepage = https://github.com/intel/libipt; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index adf856544c4..92fe81c73f4 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; + sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 080a1945215..db79bad745f 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; + outputs = [ "bin" "out" "dev" ]; + nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 844d626f49e..773acd03535 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }) ]; - postFixup = '' + postFixup = stdenv.lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" ''; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 1b73af7037b..894907c23fc 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp"; + sha256 = "046fi8cqfqh0ila3kc4sg75yvg24wmghlja2fmhkj96fjjfkzsss"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 48dbc5f395c..231b426e6a7 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libvterm-neovim"; - version = "2018-11-26"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "f600f523545b7d4018ebf320e3273795dbe43c8a"; - sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b"; + rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79"; + sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif"; }; buildInputs = [ perl ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = http://www.leonerd.org.uk/code/libvterm/; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rvolosatovs ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix new file mode 100644 index 00000000000..728b4117676 --- /dev/null +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake +, secureBuild ? true +}: + +let + soext = stdenv.hostPlatform.extensions.sharedLibrary; +in +stdenv.mkDerivation rec { + name = "mimalloc-${version}"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + rev = "refs/tags/v${version}"; + sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5"; + }; + + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; + + postInstall = '' + mkdir -p $dev + mv $out/lib/*/include $dev/include + + rm -f $out/lib/libmimalloc*${soext} # weird duplicate + + mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext} + mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a + mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o + + rm -rf $out/lib/mimalloc-* + ''; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "Compact, fast, general-purpose memory allocator"; + homepage = "https://github.com/microsoft/mimalloc"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix deleted file mode 100644 index 89db7344f99..00000000000 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, which, pkgconfig, mono }: - -stdenv.mkDerivation rec { - pname = "mono-zeroconf"; - version = "0.9.0"; - - src = fetchurl { - url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2"; - sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which mono ]; - - dontStrip = true; - - configureFlags = [ "--disable-docs" ]; - - meta = with stdenv.lib; { - description = "A cross platform Zero Configuration Networking library for Mono and .NET"; - homepage = https://www.mono-project.com/archived/monozeroconf/; - platforms = platforms.linux; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index bc8133aaf82..e2be8ded31c 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "packr"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "gobuffalo"; repo = pname; rev = "v${version}"; - sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1"; + sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i"; }; - modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n"; + subPackages = [ "packr" "v2/packr2" ]; + + modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 92f927ee398..323171212be 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.qhull.org/; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = licenses.free; + license = licenses.qhull; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index d7a44cace03..d2aadbd956a 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -80,7 +80,7 @@ wrapQtAppsHook() { do [ -d "$targetDir" ] || continue - find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file + find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file do patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 5218de07509..73be2a8ca6c 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitLab , python , wafHook @@ -22,75 +22,89 @@ , dia, tetex ? null, ghostscript ? null, texlive ? null # generates python bindings -, generateBindings ? false, ncurses ? null +, pythonSupport ? false, ncurses ? null # All modules can be enabled by choosing 'all_modules'. # we include here the DCE mandatory ones , modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] -, gcc6 , lib }: let pythonEnv = python.withPackages(ps: stdenv.lib.optional withManual ps.sphinx - ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ]) + ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) ); in stdenv.mkDerivation rec { - - name = "ns-3.${version}"; - version = "28"; - - # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2; - # fetches everything (netanim, etc), this package focuses on ns3-core - src = fetchFromGitHub { - owner = "nsnam"; - repo = "ns-3-dev-git"; - rev = name; - sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng"; + pname = "ns-3"; + version = "30"; + + src = fetchFromGitLab { + owner = "nsnam"; + repo = "ns-3-dev"; + rev = "ns-3.${version}"; + sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp"; }; nativeBuildInputs = [ wafHook ]; + + outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + # ncurses is a hidden dependency of waf when checking python - buildInputs = lib.optionals generateBindings [ castxml ncurses ] - ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ] - ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + buildInputs = lib.optionals pythonSupport [ castxml ncurses ] + ++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ] + ++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; - propagatedBuildInputs = [ gcc6 pythonEnv ]; + propagatedBuildInputs = [ pythonEnv ]; postPatch = '' patchShebangs doc/ns3_html_theme/get_version.sh ''; wafConfigureFlags = with stdenv.lib; [ - "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" + "--enable-modules=${concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" ] ++ optional (build_profile != null) "--build-profile=${build_profile}" - ++ optional generateBindings [ ] ++ optional withExamples " --enable-examples " ++ optional doCheck " --enable-tests " ; + doCheck = true; + buildTargets = "build" + lib.optionalString enableDoxygen " doxygen" + lib.optionalString withManual "sphinx"; - doCheck = true; + # to prevent fatal error: 'backward_warning.h' file not found + CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; + + postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + optional enableDoxygen "./waf doxygen" + ++ optional withManual "./waf sphinx" + ); + in "${flags}" + ; + + postInstall = '' + moveToOutput "${pythonEnv.libPrefix}" "$py" + ''; # we need to specify the proper interpreter else ns3 can check against a - # different version even though we + # different version checkPhase = '' - ${pythonEnv.interpreter} ./test.py + ${pythonEnv.interpreter} ./test.py --nowaf ''; - hardeningDisable = [ "fortify" ]; + # strictoverflow prevents clang from discovering pyembed when bindings + hardeningDisable = [ "fortify" "strictoverflow"]; - meta = { - homepage = http://www.nsnam.org; - license = stdenv.lib.licenses.gpl3; + meta = with stdenv.lib; { + homepage = "http://www.nsnam.org"; + license = licenses.gpl3; description = "A discrete time event network simulator"; - platforms = with stdenv.lib.platforms; unix; + platforms = with platforms; unix; + maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index c0b8fd7d167..3cb8998485a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; }; - buildInputs = [ cmake ] + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] ++ optional (qtLib != null) qtLib ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 5d7d0e664c6..e6a3fa9fbe1 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "yubico-pam"; - version = "unstable-2019-03-19"; + version = "unstable-2019-07-01"; src = fetchFromGitHub { owner = "Yubico"; repo = pname; - rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704"; - sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4"; + rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b"; + sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"; }; nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 586502945ba..15b907e341e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: { baseName = ''alexandria''; - version = ''20181210-git''; + version = ''20190710-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz''; - sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588''; + url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz''; + sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ args @ { fetchurl, ... }: } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL - http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz - MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests) + 0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL + http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz + MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 1d64784a0a6..988b247482b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: { baseName = ''array-utils''; - version = ''20181018-git''; + version = ''20190710-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz''; - sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn''; + url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz''; + sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ args @ { fetchurl, ... }: overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL - http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz - MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test) + SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL + http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz + MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix new file mode 100644 index 00000000000..1a56676f036 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''asdf-package-system''; + version = ''20150608-git''; + + description = ''System lacks description''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz''; + sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29''; + }; + + packageName = "asdf-package-system"; + + asdFilesToKeep = ["asdf-package-system.asd"]; + overrides = x: x; +} +/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256 + 17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL + http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz + MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME + asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 3209735adb5..365ae1d6ef6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''chunga''; version = ''20180131-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."trivial-gray-streams" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["chunga.asd"]; overrides = x: x; } -/* (SYSTEM chunga DESCRIPTION NIL SHA256 +/* (SYSTEM chunga DESCRIPTION System lacks description SHA256 0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix new file mode 100644 index 00000000000..ba295b6e43a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix @@ -0,0 +1,24 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-css''; + version = ''20140914-git''; + + description = ''Simple inline CSS generator''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz''; + sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n''; + }; + + packageName = "cl-css"; + + asdFilesToKeep = ["cl-css.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256 + 16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL + http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz + MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL + DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 7a1b7d9f863..f495d7b4c82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''cl-dbi''; version = ''20190521-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["cl-dbi.asd"]; overrides = x: x; } -/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 +/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index b04a6cd8344..81b9153fff0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''cl-test-more''; version = ''prove-20171130-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["cl-test-more.asd"]; overrides = x: x; } -/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 +/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 4999da6d0b6..4ccd82f2ccc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''cl-utilities''; version = ''1.2.4''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["cl-utilities.asd"]; overrides = x: x; } -/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256 +/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix new file mode 100644 index 00000000000..223c50f4716 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-xmlspam''; + version = ''20101006-http''; + + description = ''Streaming pattern matching for XML''; + + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz''; + sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h''; + }; + + packageName = "cl-xmlspam"; + + asdFilesToKeep = ["cl-xmlspam.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256 + 1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL + http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz + MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) + (NAME puri FILENAME puri) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel cl-ppcre closure-common cxml puri trivial-features + trivial-gray-streams) + VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 5f4a96dbcc4..4dcda09baea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''clack-socket''; version = ''clack-20190710-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["clack-socket.asd"]; overrides = x: x; } -/* (SYSTEM clack-socket DESCRIPTION NIL SHA256 +/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 0234f764498..8f2a19519ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''clack-v1-compat''; version = ''clack-20190710-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["clack-v1-compat.asd"]; overrides = x: x; } -/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 +/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 2746ccff6c9..7df1e251ece 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''closure-html''; version = ''20180711-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["closure-html.asd"]; overrides = x: x; } -/* (SYSTEM closure-html DESCRIPTION NIL SHA256 +/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256 0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index 0dd93c46fb2..c1c209093d0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''css-lite''; version = ''20120407-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["css-lite.asd"]; overrides = x: x; } -/* (SYSTEM css-lite DESCRIPTION NIL SHA256 +/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix new file mode 100644 index 00000000000..5043ff2e261 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbus''; + version = ''20190521-git''; + + description = ''A D-BUS client library for Common Lisp''; + + deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz''; + sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq''; + }; + + packageName = "dbus"; + + asdFilesToKeep = ["dbus.asd"]; + overrides = x: x; +} +/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256 + 0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL + http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5 + 59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS + ((NAME alexandria FILENAME alexandria) + (NAME asdf-package-system FILENAME asdf-package-system) + (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam) + (NAME flexi-streams FILENAME flexi-streams) + (NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib) + (NAME ironclad FILENAME ironclad) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats + iolib ironclad trivial-garbage) + VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index b247ea27298..adecbd142d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -5,7 +5,7 @@ args @ { fetchurl, ... }: parasites = [ "external-program-test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."fiveam" args."trivial-features" ]; @@ -19,7 +19,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["external-program.asd"]; overrides = x: x; } -/* (SYSTEM external-program DESCRIPTION NIL SHA256 +/* (SYSTEM external-program DESCRIPTION System lacks description SHA256 1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix new file mode 100644 index 00000000000..1677e5adcde --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''introspect-environment''; + version = ''20151031-git''; + + description = ''Small interface to portable but nonstandard introspection of CL environments.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz''; + sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30''; + }; + + packageName = "introspect-environment"; + + asdFilesToKeep = ["introspect-environment.asd"]; + overrides = x: x; +} +/* (SYSTEM introspect-environment DESCRIPTION + Small interface to portable but nonstandard introspection of CL environments. + SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL + http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz + MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME + introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git + SIBLINGS (introspect-environment-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index cdac924b439..c94277bb211 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''lack-component''; version = ''lack-20190521-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["lack-component.asd"]; overrides = x: x; } -/* (SYSTEM lack-component DESCRIPTION NIL SHA256 +/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 68604485c77..3fc76c73576 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''lack-middleware-backtrace''; version = ''lack-20190521-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."uiop" ]; @@ -17,8 +17,8 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["lack-middleware-backtrace.asd"]; overrides = x: x; } -/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL +/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description + SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index cda7716151a..221ac216cf8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''lack-util''; version = ''lack-20190521-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["lack-util.asd"]; overrides = x: x; } -/* (SYSTEM lack-util DESCRIPTION NIL SHA256 +/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix new file mode 100644 index 00000000000..aeb37b15a49 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''log4cl''; + version = ''20190107-git''; + + parasites = [ "log4cl/syslog" "log4cl/test" ]; + + description = ''System lacks description''; + + deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz''; + sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p''; + }; + + packageName = "log4cl"; + + asdFilesToKeep = ["log4cl.asd"]; + overrides = x: x; +} +/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256 + 0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL + http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz + MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME stefil FILENAME stefil)) + DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git + SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index ef0da68cfe4..13d0b971d44 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''misc-extensions''; version = ''20150608-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["misc-extensions.asd"]; overrides = x: x; } -/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256 +/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256 0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix new file mode 100644 index 00000000000..dc63474679a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''mk-string-metrics''; + version = ''20180131-git''; + + description = ''efficient implementations of various string metric algorithms''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz''; + sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4''; + }; + + packageName = "mk-string-metrics"; + + asdFilesToKeep = ["mk-string-metrics.asd"]; + overrides = x: x; +} +/* (SYSTEM mk-string-metrics DESCRIPTION + efficient implementations of various string metric algorithms SHA256 + 10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL + http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz + MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME + mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS + (mk-string-metrics-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 60385ab5939..c041d1778fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -5,7 +5,7 @@ args @ { fetchurl, ... }: parasites = [ "pcall-tests" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ]; @@ -19,7 +19,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["pcall.asd"]; overrides = x: x; } -/* (SYSTEM pcall DESCRIPTION NIL SHA256 +/* (SYSTEM pcall DESCRIPTION System lacks description SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix new file mode 100644 index 00000000000..583b30f9769 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''prove-asdf''; + version = ''prove-20171130-git''; + + description = ''System lacks description''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; + }; + + packageName = "prove-asdf"; + + asdFilesToKeep = ["prove-asdf.asd"]; + overrides = x: x; +} +/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256 + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf + DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS + (cl-test-more prove-test prove) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 9bbc47275f8..92ac9e33d49 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -3,7 +3,7 @@ args @ { fetchurl, ... }: baseName = ''prove''; version = ''20171130-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ]; @@ -17,7 +17,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["prove.asd"]; overrides = x: x; } -/* (SYSTEM prove DESCRIPTION NIL SHA256 +/* (SYSTEM prove DESCRIPTION System lacks description SHA256 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index f3c1dade821..7b5f33e7bc2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -5,7 +5,7 @@ args @ { fetchurl, ... }: parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; @@ -19,7 +19,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["simple-date.asd"]; overrides = x: x; } -/* (SYSTEM simple-date DESCRIPTION NIL SHA256 +/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix new file mode 100644 index 00000000000..d4004f3f8b5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''str''; + version = ''cl-20190710-git''; + + description = ''Modern, consistent and terse Common Lisp string manipulation library.''; + + deps = [ args."cl-ppcre" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz''; + sha256 = ''1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9''; + }; + + packageName = "str"; + + asdFilesToKeep = ["str.asd"]; + overrides = x: x; +} +/* (SYSTEM str DESCRIPTION + Modern, consistent and terse Common Lisp string manipulation library. + SHA256 1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9 URL + http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz + MD5 d3c72394ea33291347d8c825c153c143 NAME str FILENAME str DEPS + ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION + cl-20190710-git SIBLINGS (str.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix new file mode 100644 index 00000000000..74c84f0520f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -0,0 +1,44 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia''; + version = ''20190710-git''; + + description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + + deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia"; + + asdFilesToKeep = ["trivia.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia DESCRIPTION + NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase + SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia FILENAME trivia DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (alexandria closer-mop introspect-environment iterate lisp-namespace + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2 type-i) + VERSION 20190710-git SIBLINGS + (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 + trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test + trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix new file mode 100644 index 00000000000..d1237b5ac26 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -0,0 +1,43 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_balland2006''; + version = ''trivia-20190710-git''; + + description = ''Optimizer for Trivia based on (Balland 2006)''; + + deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.balland2006"; + + asdFilesToKeep = ["trivia.balland2006.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.balland2006 DESCRIPTION + Optimizer for Trivia based on (Balland 2006) SHA256 + 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.balland2006 FILENAME + trivia_dot_balland2006 DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (alexandria closer-mop introspect-environment iterate lisp-namespace + trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 + type-i) + VERSION trivia-20190710-git SIBLINGS + (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1 + trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix new file mode 100644 index 00000000000..30f82362537 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_level0''; + version = ''trivia-20190710-git''; + + description = ''Bootstrapping Pattern Matching Library for implementing Trivia''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.level0"; + + asdFilesToKeep = ["trivia.level0.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.level0 DESCRIPTION + Bootstrapping Pattern Matching Library for implementing Trivia SHA256 + 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level0 FILENAME + trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES + (alexandria) VERSION trivia-20190710-git SIBLINGS + (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1 + trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix new file mode 100644 index 00000000000..13680b8706c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_level1''; + version = ''trivia-20190710-git''; + + description = ''Core patterns of Trivia''; + + deps = [ args."alexandria" args."trivia_dot_level0" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.level1"; + + asdFilesToKeep = ["trivia.level1.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256 + 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level1 FILENAME + trivia_dot_level1 DEPS + ((NAME alexandria FILENAME alexandria) + (NAME trivia.level0 FILENAME trivia_dot_level0)) + DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20190710-git + SIBLINGS + (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 + trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix new file mode 100644 index 00000000000..acbcd0b31ec --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_level2''; + version = ''trivia-20190710-git''; + + description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + + deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.level2"; + + asdFilesToKeep = ["trivia.level2.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.level2 DESCRIPTION + NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase + SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level2 FILENAME + trivia_dot_level2 DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) + DEPENDENCIES + (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 + trivial-cltl2) + VERSION trivia-20190710-git SIBLINGS + (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 + trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix new file mode 100644 index 00000000000..b82f6089b06 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -0,0 +1,43 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_trivial''; + version = ''trivia-20190710-git''; + + description = ''Base level system of Trivia with a trivial optimizer. + Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, + in order to avoid the circular dependency.''; + + deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.trivial"; + + asdFilesToKeep = ["trivia.trivial.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.trivial DESCRIPTION + Base level system of Trivia with a trivial optimizer. + Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, + in order to avoid the circular dependency. + SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.trivial FILENAME + trivia_dot_trivial DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) + DEPENDENCIES + (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 + trivia.level2 trivial-cltl2) + VERSION trivia-20190710-git SIBLINGS + (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 + trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix new file mode 100644 index 00000000000..16d265d465a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-clipboard''; + version = ''20190202-git''; + + description = ''trivial-clipboard let access system clipboard.''; + + deps = [ args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz''; + sha256 = ''06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1''; + }; + + packageName = "trivial-clipboard"; + + asdFilesToKeep = ["trivial-clipboard.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-clipboard DESCRIPTION + trivial-clipboard let access system clipboard. SHA256 + 06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1 URL + http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz + MD5 d9b9ee3754e10888ce243172681a0db2 NAME trivial-clipboard FILENAME + trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) + VERSION 20190202-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix new file mode 100644 index 00000000000..a5242030473 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-cltl2''; + version = ''20190710-git''; + + description = ''Compatibility package exporting CLtL2 functionality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz''; + sha256 = ''1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb''; + }; + + packageName = "trivial-cltl2"; + + asdFilesToKeep = ["trivial-cltl2.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-cltl2 DESCRIPTION + Compatibility package exporting CLtL2 functionality SHA256 + 1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb URL + http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz + MD5 8114f96b9770a9f0e0a94933918dc171 NAME trivial-cltl2 FILENAME + trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index 0ac57089e50..b4282ec33ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -5,7 +5,7 @@ args @ { fetchurl, ... }: parasites = [ "trivial-utf-8-tests" ]; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -19,7 +19,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["trivial-utf-8.asd"]; overrides = x: x; } -/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256 +/* (SYSTEM trivial-utf-8 DESCRIPTION System lacks description SHA256 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix new file mode 100644 index 00000000000..40e718cc10b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''type-i''; + version = ''20190521-git''; + + description = ''Type Inference Utility on Fundamentally 1-arg Predicates''; + + deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz''; + sha256 = ''1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99''; + }; + + packageName = "type-i"; + + asdFilesToKeep = ["type-i.asd"]; + overrides = x: x; +} +/* (SYSTEM type-i DESCRIPTION + Type Inference Utility on Fundamentally 1-arg Predicates SHA256 + 1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99 URL + http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz + MD5 9906855a0650f93186f37e162429e58b NAME type-i FILENAME type-i DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME introspect-environment FILENAME introspect-environment) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) + DEPENDENCIES + (alexandria closer-mop introspect-environment lisp-namespace trivia.level0 + trivia.level1 trivia.level2 trivia.trivial trivial-cltl2) + VERSION 20190521-git SIBLINGS (type-i.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix new file mode 100644 index 00000000000..4af27c449a3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''unix-opts''; + version = ''20180430-git''; + + description = ''minimalistic parser of command line arguments''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz''; + sha256 = ''05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968''; + }; + + packageName = "unix-opts"; + + asdFilesToKeep = ["unix-opts.asd"]; + overrides = x: x; +} +/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments + SHA256 05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968 URL + http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz + MD5 2875ea0a1f5c49ef2697bb1046c4c4e5 NAME unix-opts FILENAME unix-opts DEPS + NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS (unix-opts-tests) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index ea08214cb6f..a9a1cfc7ec0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -5,7 +5,7 @@ args @ { fetchurl, ... }: parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ]; @@ -19,7 +19,7 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["xmls.asd"]; overrides = x: x; } -/* (SYSTEM xmls DESCRIPTION NIL SHA256 +/* (SYSTEM xmls DESCRIPTION System lacks description SHA256 1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5 2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 052bfb11949..1ff76e3ec4c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -43,11 +43,24 @@ in propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with pkgs; [libfixposix gcc]) ; + overrides = y: (x.overrides y) // { + prePatch = '' + sed 's|default \"libfixposix\"|default \"${pkgs.libfixposix}/lib/libfixposix\"|' -i src/syscalls/ffi-functions-unix.lisp + ''; + }; + }; cxml = skipBuildPhase; wookie = addNativeLibs (with pkgs; [libuv openssl]); lev = addNativeLibs [pkgs.libev]; - cl_plus_ssl = addNativeLibs [pkgs.openssl]; + cl_plus_ssl = x: rec { + propagatedBuildInputs = [pkgs.openssl]; + overrides = y: (x.overrides y) // { + prePatch = '' + sed 's|libssl.so|${pkgs.openssl.out}/lib/libssl.so|' -i src/reload.lisp + ''; + }; + }; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; @@ -85,7 +98,14 @@ $out/lib/common-lisp/query-fs" ''; }; }; - sqlite = addNativeLibs [pkgs.sqlite]; + sqlite = x: { + propagatedBuildInputs = [pkgs.sqlite]; + overrides = y: (x.overrides y) // { + prePatch = ((x.overrides y).preConfigure or "") + '' + sed 's|libsqlite3|${pkgs.sqlite.out}/lib/libsqlite3|' -i sqlite-ffi.lisp + ''; + }; + }; swank = x: { overrides = y: (x.overrides y) // { postPatch = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 5c56ddfa2a2..a4dee0bce57 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -10,8 +10,7 @@ cffi cffi-grovel chipz circular-streams -clack -clack-v1-compat +cl+ssl cl-ansi-text cl-async cl-async-base @@ -21,6 +20,7 @@ cl-base64 cl-cli cl-colors cl-cookie +cl-css cl-csv cl-dbi cl-emb @@ -33,8 +33,6 @@ cl-json cl-l10n cl-libuv cl-mysql -closer-mop -closure-html cl-pdf cl-ppcre cl-ppcre-template @@ -42,12 +40,6 @@ cl-ppcre-unicode cl-protobufs cl-reexport cl-smtp -clsql -clsql-postgresql -clsql-postgresql-socket -clsql-sqlite3 -clss -cl+ssl cl-syntax-annot cl-syntax-anonfun cl-syntax-markup @@ -58,9 +50,17 @@ cl-unification cl-utilities cl-vectors cl-who +clack +clack-v1-compat +closer-mop +closure-html +clsql +clsql-postgresql +clsql-postgresql-socket +clsql-sqlite3 +clss clx clx-truetype -xembed command-line-arguments css-lite css-selectors @@ -70,6 +70,7 @@ cxml dbd-mysql dbd-postgres dbd-sqlite3 +dbus dexador documentation-utils drakma @@ -93,15 +94,17 @@ iterate lack let-plus lev -lisp-namespace -local-time lfarm-client lfarm-server lfarm-ssl +lisp-namespace +local-time +log4cl lparallel lquery marshal misc-extensions +mk-string-metrics mt19937 nibbles optima @@ -111,24 +114,32 @@ plump proc-parse prove prove +prove-asdf query-fs quri salza2 simple-date smart-buffer split-sequence +sqlite static-vectors +str stumpwm +swank swap-bytes +trivia trivial-backtrace +trivial-clipboard trivial-indent trivial-mimes trivial-types trivial-utf-8 uffi +unix-opts usocket woo wookie +xembed xkeyboard xmls xsubseq diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 2e71e0174f6..d430f72353a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -20,18 +20,103 @@ let quicklisp-to-nix-packages = rec { })); - "lfarm-common" = buildLispPackage + "type-i" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."lfarm-common" or (x: {})) - (import ./quicklisp-to-nix-output/lfarm-common.nix { + (qlOverrides."type-i" or (x: {})) + (import ./quicklisp-to-nix-output/type-i.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-store" = quicklisp-to-nix-packages."cl-store"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "usocket" = quicklisp-to-nix-packages."usocket"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "trivial-cltl2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-cltl2" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-cltl2.nix { + inherit fetchurl; + })); + + + "trivia_dot_trivial" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_trivial" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "trivia_dot_level2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_level2" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_level2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "trivia_dot_level1" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_level1" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_level1.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + })); + + + "trivia_dot_level0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_level0" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_level0.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "trivia_dot_balland2006" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_balland2006" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + + "introspect-environment" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."introspect-environment" or (x: {})) + (import ./quicklisp-to-nix-output/introspect-environment.nix { + inherit fetchurl; })); @@ -47,6 +132,21 @@ let quicklisp-to-nix-packages = rec { })); + "lfarm-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lfarm-common" or (x: {})) + (import ./quicklisp-to-nix-output/lfarm-common.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-store" = quicklisp-to-nix-packages."cl-store"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "rt" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rt" or (x: {})) @@ -124,16 +224,27 @@ let quicklisp-to-nix-packages = rec { })); - "sqlite" = buildLispPackage + "cl-xmlspam" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."sqlite" or (x: {})) - (import ./quicklisp-to-nix-output/sqlite.nix { + (qlOverrides."cl-xmlspam" or (x: {})) + (import ./quicklisp-to-nix-output/cl-xmlspam.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "iterate" = quicklisp-to-nix-packages."iterate"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "puri" = quicklisp-to-nix-packages."puri"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "asdf-package-system" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-package-system" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-package-system.nix { + inherit fetchurl; })); @@ -207,14 +318,6 @@ let quicklisp-to-nix-packages = rec { })); - "swank" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swank" or (x: {})) - (import ./quicklisp-to-nix-output/swank.nix { - inherit fetchurl; - })); - - "collectors" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."collectors" or (x: {})) @@ -314,6 +417,16 @@ let quicklisp-to-nix-packages = rec { })); + "clsql-uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-uffi" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-uffi.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + "cl-paths" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-paths" or (x: {})) @@ -346,16 +459,6 @@ let quicklisp-to-nix-packages = rec { })); - "clsql-uffi" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-uffi" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-uffi.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre"; @@ -884,6 +987,15 @@ let quicklisp-to-nix-packages = rec { })); + "xembed" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xembed" or (x: {})) + (import ./quicklisp-to-nix-output/xembed.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); + + "wookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."wookie" or (x: {})) @@ -961,6 +1073,14 @@ let quicklisp-to-nix-packages = rec { })); + "unix-opts" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."unix-opts" or (x: {})) + (import ./quicklisp-to-nix-output/unix-opts.nix { + inherit fetchurl; + })); + + "uffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uffi" or (x: {})) @@ -1001,6 +1121,15 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-clipboard" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-clipboard" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-clipboard.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "trivial-backtrace" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-backtrace" or (x: {})) @@ -1009,6 +1138,26 @@ let quicklisp-to-nix-packages = rec { })); + "trivia" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia" or (x: {})) + (import ./quicklisp-to-nix-output/trivia.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "swap-bytes" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."swap-bytes" or (x: {})) @@ -1019,6 +1168,14 @@ let quicklisp-to-nix-packages = rec { })); + "swank" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swank" or (x: {})) + (import ./quicklisp-to-nix-output/swank.nix { + inherit fetchurl; + })); + + "stumpwm" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."stumpwm" or (x: {})) @@ -1030,6 +1187,15 @@ let quicklisp-to-nix-packages = rec { })); + "str" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."str" or (x: {})) + (import ./quicklisp-to-nix-output/str.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + })); + + "static-vectors" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."static-vectors" or (x: {})) @@ -1045,6 +1211,19 @@ let quicklisp-to-nix-packages = rec { })); + "sqlite" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."sqlite" or (x: {})) + (import ./quicklisp-to-nix-output/sqlite.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "split-sequence" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."split-sequence" or (x: {})) @@ -1124,6 +1303,14 @@ let quicklisp-to-nix-packages = rec { })); + "prove-asdf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."prove-asdf" or (x: {})) + (import ./quicklisp-to-nix-output/prove-asdf.nix { + inherit fetchurl; + })); + + "prove" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."prove" or (x: {})) @@ -1211,6 +1398,14 @@ let quicklisp-to-nix-packages = rec { })); + "mk-string-metrics" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mk-string-metrics" or (x: {})) + (import ./quicklisp-to-nix-output/mk-string-metrics.nix { + inherit fetchurl; + })); + + "misc-extensions" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."misc-extensions" or (x: {})) @@ -1251,6 +1446,38 @@ let quicklisp-to-nix-packages = rec { })); + "log4cl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."log4cl" or (x: {})) + (import ./quicklisp-to-nix-output/log4cl.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "stefil" = quicklisp-to-nix-packages."stefil"; + })); + + + "local-time" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."local-time" or (x: {})) + (import ./quicklisp-to-nix-output/local-time.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "stefil" = quicklisp-to-nix-packages."stefil"; + })); + + + "lisp-namespace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-namespace" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-namespace.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "lfarm-ssl" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lfarm-ssl" or (x: {})) @@ -1305,27 +1532,6 @@ let quicklisp-to-nix-packages = rec { })); - "local-time" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."local-time" or (x: {})) - (import ./quicklisp-to-nix-output/local-time.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "stefil" = quicklisp-to-nix-packages."stefil"; - })); - - - "lisp-namespace" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lisp-namespace" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-namespace.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - })); - - "lev" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lev" or (x: {})) @@ -1670,6 +1876,23 @@ let quicklisp-to-nix-packages = rec { })); + "dbus" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbus" or (x: {})) + (import ./quicklisp-to-nix-output/dbus.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "asdf-package-system" = quicklisp-to-nix-packages."asdf-package-system"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-xmlspam" = quicklisp-to-nix-packages."cl-xmlspam"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "ieee-floats" = quicklisp-to-nix-packages."ieee-floats"; + "iolib" = quicklisp-to-nix-packages."iolib"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "dbd-sqlite3" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dbd-sqlite3" or (x: {})) @@ -1865,15 +2088,6 @@ let quicklisp-to-nix-packages = rec { })); - "xembed" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."xembed" or (x: {})) - (import ./quicklisp-to-nix-output/xembed.nix { - inherit fetchurl; - "clx" = quicklisp-to-nix-packages."clx"; - })); - - "clx-truetype" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clx-truetype" or (x: {})) @@ -1902,6 +2116,167 @@ let quicklisp-to-nix-packages = rec { })); + "clss" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clss" or (x: {})) + (import ./quicklisp-to-nix-output/clss.nix { + inherit fetchurl; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "clsql-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql-socket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "md5" = quicklisp-to-nix-packages."md5"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql.nix { + inherit fetchurl; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "clack-test" = quicklisp-to-nix-packages."clack-test"; + "dexador" = quicklisp-to-nix-packages."dexador"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "prove" = quicklisp-to-nix-packages."prove"; + "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "cl-who" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-who" or (x: {})) @@ -2010,77 +2385,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl_plus_ssl" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl_plus_ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - - "clss" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clss" or (x: {})) - (import ./quicklisp-to-nix-output/clss.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; - "plump" = quicklisp-to-nix-packages."plump"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "clsql-sqlite3" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-sqlite3" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql-socket" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql-socket" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "md5" = quicklisp-to-nix-packages."md5"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql.nix { - inherit fetchurl; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - "cl-smtp" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-smtp" or (x: {})) @@ -2165,28 +2469,6 @@ let quicklisp-to-nix-packages = rec { })); - "closure-html" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-html" or (x: {})) - (import ./quicklisp-to-nix-output/closure-html.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closer-mop" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closer-mop" or (x: {})) - (import ./quicklisp-to-nix-output/closer-mop.nix { - inherit fetchurl; - })); - - "cl-mysql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-mysql" or (x: {})) @@ -2360,6 +2642,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-css" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-css" or (x: {})) + (import ./quicklisp-to-nix-output/cl-css.nix { + inherit fetchurl; + })); + + "cl-cookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-cookie" or (x: {})) @@ -2495,87 +2785,19 @@ let quicklisp-to-nix-packages = rec { })); - "clack-v1-compat" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."clack-v1-compat" or (x: {})) - (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; - "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "circular-streams" = quicklisp-to-nix-packages."circular-streams"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl-colors" = quicklisp-to-nix-packages."cl-colors"; - "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; - "clack" = quicklisp-to-nix-packages."clack"; - "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; - "clack-socket" = quicklisp-to-nix-packages."clack-socket"; - "clack-test" = quicklisp-to-nix-packages."clack-test"; - "dexador" = quicklisp-to-nix-packages."dexador"; - "fast-http" = quicklisp-to-nix-packages."fast-http"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "jonathan" = quicklisp-to-nix-packages."jonathan"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "let-plus" = quicklisp-to-nix-packages."let-plus"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "marshal" = quicklisp-to-nix-packages."marshal"; - "md5" = quicklisp-to-nix-packages."md5"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "prove" = quicklisp-to-nix-packages."prove"; - "quri" = quicklisp-to-nix-packages."quri"; - "rfc2388" = quicklisp-to-nix-packages."rfc2388"; - "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - "xsubseq" = quicklisp-to-nix-packages."xsubseq"; - })); - - - "clack" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack" or (x: {})) - (import ./quicklisp-to-nix-output/clack.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; "uiop" = quicklisp-to-nix-packages."uiop"; })); diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 233503c2eca..9f57fbb5fa9 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -276,8 +276,19 @@ with super; propagatedBuildInputs = [ pkgs.libuv ]; + + passthru = { + libluv = self.luv.override({ + preBuild = self.luv.preBuild + '' + sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt + sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt + sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt + ''; + }); + }; }); + rapidjson = super.rapidjson.override({ preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index ef5afe37117..bcb72488a9e 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -30,6 +30,7 @@ , "dat" , "dhcp" , "dnschain" +, "dockerfile-language-server-nodejs" , "elasticdump" , "elm-live" , "elm-oracle" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 3f4c4d1b9b5..300299a4d88 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.803.4" = { + "@angular-devkit/architect-0.803.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.803.4"; + version = "0.803.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz"; - sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.5.tgz"; + sha512 = "hOcYF5fG3oieTc/C1QZqXsON8m8cpdtfdWhY7F7tmqqZ4JBR7igH4SSFQOoQwTj77rsqtkOLI9isVLpoSGX0DQ=="; }; }; - "@angular-devkit/core-8.3.4" = { + "@angular-devkit/core-8.3.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.3.4"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz"; - sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz"; + sha512 = "ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg=="; }; }; - "@angular-devkit/schematics-8.3.4" = { + "@angular-devkit/schematics-8.3.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.3.4"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz"; - sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz"; + sha512 = "RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg=="; }; }; "@antora/asciidoc-loader-2.1.1" = { @@ -1273,13 +1273,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@hapi/address-2.1.1" = { + "@hapi/address-2.1.2" = { name = "_at_hapi_slash_address"; packageName = "@hapi/address"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz"; - sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA=="; + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz"; + sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q=="; }; }; "@hapi/bourne-1.3.2" = { @@ -1309,13 +1309,13 @@ let sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; - "@hapi/topo-3.1.3" = { + "@hapi/topo-3.1.4" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz"; - sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ=="; + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz"; + sha512 = "aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA=="; }; }; "@iarna/toml-2.2.3" = { @@ -1327,94 +1327,94 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-2.1.6" = { + "@ionic/cli-framework-2.1.7" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz"; - sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.7.tgz"; + sha512 = "osuKbmCIzT0H+g39lDy+EmsP5RHc+aYOv+BN+IngsaxKb7ya0V/JlLO1vLkd7RYT+lmiQWiCi7RpHPeEgQJFtw=="; }; }; - "@ionic/discover-2.0.5" = { + "@ionic/discover-2.0.6" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz"; - sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz"; + sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg=="; }; }; - "@ionic/utils-array-1.2.0" = { + "@ionic/utils-array-1.2.1" = { name = "_at_ionic_slash_utils-array"; packageName = "@ionic/utils-array"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz"; - sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg=="; + url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz"; + sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg=="; }; }; - "@ionic/utils-fs-2.0.6" = { + "@ionic/utils-fs-2.0.7" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz"; - sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.7.tgz"; + sha512 = "rXTKJD66qocDs8w72+z7yw6P8H095yexIMsUbNiJFjMm3Cx542i+Tw9gbGwYN356WrA/0EATXD/zVZDzvDsSKQ=="; }; }; - "@ionic/utils-network-1.0.4" = { + "@ionic/utils-network-1.0.5" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz"; - sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz"; + sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q=="; }; }; - "@ionic/utils-object-1.0.4" = { + "@ionic/utils-object-1.0.5" = { name = "_at_ionic_slash_utils-object"; packageName = "@ionic/utils-object"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz"; - sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw=="; + url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz"; + sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ=="; }; }; - "@ionic/utils-process-1.0.4" = { + "@ionic/utils-process-1.0.5" = { name = "_at_ionic_slash_utils-process"; packageName = "@ionic/utils-process"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz"; - sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g=="; + url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz"; + sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw=="; }; }; - "@ionic/utils-stream-2.0.3" = { + "@ionic/utils-stream-2.0.4" = { name = "_at_ionic_slash_utils-stream"; packageName = "@ionic/utils-stream"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz"; - sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA=="; + url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz"; + sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ=="; }; }; - "@ionic/utils-subprocess-1.0.7" = { + "@ionic/utils-subprocess-1.0.8" = { name = "_at_ionic_slash_utils-subprocess"; packageName = "@ionic/utils-subprocess"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz"; - sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg=="; + url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.8.tgz"; + sha512 = "gfVCzccOQ3PVfY6d1hDZq1Qv7hOXAn3ZlepAEbUBOeFauIhXmwmwVdIRa9cfi3cESpDidNQ3dpmXyC+nKxv0Og=="; }; }; - "@ionic/utils-terminal-1.0.4" = { + "@ionic/utils-terminal-1.0.5" = { name = "_at_ionic_slash_utils-terminal"; packageName = "@ionic/utils-terminal"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz"; - sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA=="; + url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz"; + sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2065,13 +2065,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.9" = { + "@octokit/rest-16.30.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.9"; + version = "16.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz"; - sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.30.0.tgz"; + sha512 = "TN5MbqVuqxT/s87D6tGe3zsMvyHUQSkGFMBHuwBToPQGV3eG2a67rJW2rag2vJr7JusWyERDhQ4g/4HvFo9B1g=="; }; }; "@parcel/fs-1.11.0" = { @@ -2218,31 +2218,31 @@ let sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; - "@schematics/angular-8.3.4" = { + "@schematics/angular-8.3.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.3.4"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz"; - sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.5.tgz"; + sha512 = "3YKurSNqUfjVrbENVlnTBNGYBWjdyjrWzJRlwWbCq+owQLhkZ/N5qVirt/SDw5T9hK2AEMOKjLkQYtpE+aOCgg=="; }; }; - "@schematics/update-0.803.4" = { + "@schematics/update-0.803.5" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.803.4"; + version = "0.803.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz"; - sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.5.tgz"; + sha512 = "v2qU0ATb1jND8GIGQFnI1QLWoquUjJ2fJ37HoDSO3rmttZ/NvoV4sNDGhk/pPUcmeXa+prURfJCCCSeHZ/yKkw=="; }; }; - "@serverless/cli-1.2.1" = { + "@serverless/cli-1.2.3" = { name = "_at_serverless_slash_cli"; packageName = "@serverless/cli"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz"; - sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ=="; + url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.3.tgz"; + sha512 = "N/hsPZrE/zK8Iv98bdEG7J6ZhotWXwywjc/bKWcbhZeXENqbS7UD2qtyL/pfGuNodFVG587l8Cf+UvK8OcA6Qg=="; }; }; "@serverless/component-metrics-1.0.8" = { @@ -2263,13 +2263,13 @@ let sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw=="; }; }; - "@serverless/enterprise-plugin-2.0.0" = { + "@serverless/enterprise-plugin-3.0.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz"; - sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.0.0.tgz"; + sha512 = "+L+SeQV0MKQN9TBXC6Xmgcw7BVfW8Q3F/lMjB1MPsBd0RZPzYnVlWcVg4cA6tgvkpfdw8NVlh/QXFs+603zHrg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5845,13 +5845,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.529.0" = { + "aws-sdk-2.533.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.529.0"; + version = "2.533.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz"; - sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.533.0.tgz"; + sha512 = "OSe7C0jnBdgfzedOtK+TgBEwtJaaZovm+Q2fbqIlfhUWg3rhhkt3oLyQ9bRD30/CFaunLhLr/8HAAN+/x+DWAA=="; }; }; "aws-sign2-0.6.0" = { @@ -6943,6 +6943,15 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; + "base64id-2.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"; + sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; + }; + }; "base64url-3.0.1" = { name = "base64url"; packageName = "base64url"; @@ -7114,13 +7123,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.44" = { + "big-integer-1.6.45" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.44"; + version = "1.6.45"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz"; - sha512 = "7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz"; + sha512 = "nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA=="; }; }; "big.js-5.2.2" = { @@ -7384,13 +7393,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.16" = { + "blessed-contrib-4.8.17" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.16"; + version = "4.8.17"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz"; - sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.17.tgz"; + sha512 = "uhywRrzJQxtpkowgDHdejIE911Pgt0raYOQUoFC/qREyQvXsz5DMj2J2JVjwcx2bpzbDdHRoP/lcWLE1Ol3vCQ=="; }; }; "blob-0.0.2" = { @@ -9067,13 +9076,13 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.1.0" = { + "chokidar-3.1.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz"; - sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz"; + sha512 = "df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ=="; }; }; "chownr-0.0.2" = { @@ -9976,6 +9985,15 @@ let sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; "colorspace-1.1.2" = { name = "colorspace"; packageName = "colorspace"; @@ -11290,6 +11308,15 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; + "cross-spawn-7.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz"; + sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw=="; + }; + }; "cross-spawn-async-2.2.5" = { name = "cross-spawn-async"; packageName = "cross-spawn-async"; @@ -12271,6 +12298,15 @@ let sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; + "decompress-response-4.2.1" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + }; "decompress-tar-4.1.1" = { name = "decompress-tar"; packageName = "decompress-tar"; @@ -12541,13 +12577,13 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "deferred-leveldown-5.2.0" = { + "deferred-leveldown-5.2.1" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz"; - sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g=="; + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.1.tgz"; + sha512 = "PwXZRn5EmW+IKYVAYVc7G9FsRkShr0myPubPuq+mtLhDq9xSUqfvTlNZKoeQGeXACHXkeCFurKrz5oo6TZ3qwg=="; }; }; "define-properties-1.1.3" = { @@ -13207,6 +13243,15 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; + "dockerfile-ast-0.0.12" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz"; + sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw=="; + }; + }; "dockerfile-ast-0.0.16" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -13216,6 +13261,33 @@ let sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw=="; }; }; + "dockerfile-language-service-0.0.8" = { + name = "dockerfile-language-service"; + packageName = "dockerfile-language-service"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz"; + sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw=="; + }; + }; + "dockerfile-utils-0.0.11" = { + name = "dockerfile-utils"; + packageName = "dockerfile-utils"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.11.tgz"; + sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ=="; + }; + }; + "dockerfile-utils-0.0.13" = { + name = "dockerfile-utils"; + packageName = "dockerfile-utils"; + version = "0.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz"; + sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw=="; + }; + }; "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; @@ -13801,13 +13873,13 @@ let sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; }; }; - "electron-to-chromium-1.3.260" = { + "electron-to-chromium-1.3.264" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.260"; + version = "1.3.264"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz"; - sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz"; + sha512 = "z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -14081,6 +14153,15 @@ let sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w=="; }; }; + "engine.io-3.4.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz"; + sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -14108,6 +14189,15 @@ let sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ=="; }; }; + "engine.io-client-3.4.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz"; + sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -14126,6 +14216,15 @@ let sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA=="; }; }; + "engine.io-parser-2.2.0" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz"; + sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w=="; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -16349,13 +16448,13 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; - "flow-parser-0.107.0" = { + "flow-parser-0.108.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.107.0"; + version = "0.108.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz"; - sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.108.0.tgz"; + sha512 = "Ug8VuwlyDIZq5Xgrf+T7XLpKydhqYyNd8lmFtf7PZbu90T5LL+FeHjWzxyrBn35RCCZMw7pXrjCrHOSs+2zXyg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -17663,13 +17762,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.0.0" = { + "glob-parent-5.1.0" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; - sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; + sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; }; }; "glob-stream-3.1.18" = { @@ -17735,13 +17834,13 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-agent-2.1.0" = { + "global-agent-2.1.1" = { name = "global-agent"; packageName = "global-agent"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz"; - sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw=="; + url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.1.tgz"; + sha512 = "MjLP2o331SpSxBMBFSWxs5PaWDhjXxysHepQ/hmBCjhjw74cbO9R/IBCbaSJ4GLPKm01dRcgXBtRr7p7XZEnfg=="; }; }; "global-dirs-0.1.1" = { @@ -18060,6 +18159,15 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; + "graceful-fs-4.2.1" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz"; + sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="; + }; + }; "graceful-fs-4.2.2" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -18132,13 +18240,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.5.6" = { + "graphql-14.5.7" = { name = "graphql"; packageName = "graphql"; - version = "14.5.6"; + version = "14.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz"; - sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz"; + sha512 = "as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A=="; }; }; "graphql-anywhere-4.2.4" = { @@ -18456,13 +18564,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "handlebars-4.2.0" = { + "handlebars-4.2.1" = { name = "handlebars"; packageName = "handlebars"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz"; - sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz"; + sha512 = "bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ=="; }; }; "har-schema-1.0.5" = { @@ -19330,6 +19438,15 @@ let sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; }; }; + "http-proxy-1.18.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; + sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ=="; + }; + }; "http-proxy-agent-2.1.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -19609,15 +19726,6 @@ let sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; - }; - }; "iferr-0.1.5" = { name = "iferr"; packageName = "iferr"; @@ -20095,6 +20203,15 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; + "inquirer-7.0.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz"; + sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ=="; + }; + }; "inquirer-autocomplete-prompt-1.0.1" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -21427,13 +21544,13 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "is-wsl-2.1.0" = { + "is-wsl-2.1.1" = { name = "is-wsl"; packageName = "is-wsl"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz"; - sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ=="; + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz"; + sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="; }; }; "is-yarn-global-0.3.0" = { @@ -23084,13 +23201,13 @@ let sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; - "leveldown-5.2.0" = { + "leveldown-5.2.1" = { name = "leveldown"; packageName = "leveldown"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz"; - sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg=="; + url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.1.tgz"; + sha512 = "369I1rGibXV7CIoLhsSpp/ExwQucI3xUe0RXQrMu4ji6OG9PFMVAQuzsEXKwAi3BWsjFzcFtodAP8MW5fmfung=="; }; }; "levelup-0.19.1" = { @@ -25956,6 +26073,15 @@ let sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; + "mimic-response-2.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz"; + sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ=="; + }; + }; "min-document-2.19.0" = { name = "min-document"; packageName = "min-document"; @@ -26091,13 +26217,13 @@ let sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ=="; }; }; - "minipass-2.6.2" = { + "minipass-2.8.1" = { name = "minipass"; packageName = "minipass"; - version = "2.6.2"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz"; - sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz"; + sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg=="; }; }; "minitouch-prebuilt-1.2.0" = { @@ -28121,13 +28247,13 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "normalize-url-4.3.0" = { + "normalize-url-4.4.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.3.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz"; - sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.4.1.tgz"; + sha512 = "rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg=="; }; }; "now-and-later-2.0.1" = { @@ -28184,13 +28310,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-3.1.3" = { + "npm-lifecycle-3.1.4" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz"; - sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz"; + sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A=="; }; }; "npm-package-arg-6.1.0" = { @@ -29490,13 +29616,13 @@ let sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; }; }; - "p-timeout-3.1.0" = { + "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz"; - sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw=="; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-1.0.0" = { @@ -29697,13 +29823,13 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.4" = { + "parse-asn1-5.1.5" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz"; - sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; }; }; "parse-english-4.1.2" = { @@ -30210,6 +30336,15 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; + "path-key-3.1.0" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz"; + sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; + }; + }; "path-loader-1.0.10" = { name = "path-loader"; packageName = "path-loader"; @@ -32722,13 +32857,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.8.0" = { + "qs-6.9.0" = { name = "qs"; packageName = "qs"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz"; - sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz"; + sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA=="; }; }; "query-string-1.0.1" = { @@ -35908,13 +36043,13 @@ let sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw=="; }; }; - "simple-get-3.0.3" = { + "simple-get-3.1.0" = { name = "simple-get"; packageName = "simple-get"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz"; - sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; }; }; "simple-git-1.126.0" = { @@ -35944,13 +36079,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.5.0" = { + "simple-peer-9.6.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.5.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.5.0.tgz"; - sha512 = "3tROq3nBo/CIZI8PWlXGbAxQIlQF6KQ/zcd4lQ2pAC4+rPiV7E721hI22nTO54uw/nzb2HKbvmDtZ4Wr173+vA=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz"; + sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA=="; }; }; "simple-sha1-2.1.2" = { @@ -36241,13 +36376,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.227.0" = { + "snyk-1.228.3" = { name = "snyk"; packageName = "snyk"; - version = "1.227.0"; + version = "1.228.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz"; - sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz"; + sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA=="; }; }; "snyk-config-2.2.3" = { @@ -36286,13 +36421,13 @@ let sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg=="; }; }; - "snyk-gradle-plugin-3.0.2" = { + "snyk-gradle-plugin-3.1.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz"; - sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz"; + sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ=="; }; }; "snyk-module-1.9.1" = { @@ -36439,6 +36574,15 @@ let sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w=="; }; }; + "socket.io-2.3.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz"; + sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -36484,6 +36628,15 @@ let sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA=="; }; }; + "socket.io-client-2.3.0" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz"; + sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA=="; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -36520,6 +36673,15 @@ let sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; }; }; + "socket.io-parser-3.4.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz"; + sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ=="; + }; + }; "socks-2.3.2" = { name = "socks"; packageName = "socks"; @@ -39059,13 +39221,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.10" = { + "tar-4.4.11" = { name = "tar"; packageName = "tar"; - version = "4.4.10"; + version = "4.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; - sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz"; + sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA=="; }; }; "tar-fs-2.0.0" = { @@ -39581,13 +39743,13 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; - "timeout-refresh-1.0.0" = { + "timeout-refresh-1.0.1" = { name = "timeout-refresh"; packageName = "timeout-refresh"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz"; - sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg=="; + url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz"; + sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw=="; }; }; "timers-browserify-1.4.2" = { @@ -40535,13 +40697,13 @@ let sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA=="; }; }; - "type-1.0.3" = { + "type-1.2.0" = { name = "type"; packageName = "type"; - version = "1.0.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz"; - sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="; + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; "type-check-0.3.2" = { @@ -42758,6 +42920,15 @@ let sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA=="; }; }; + "vscode-languageserver-types-3.6.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz"; + sha512 = "GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw=="; + }; + }; "vscode-nls-3.2.5" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -43019,13 +43190,13 @@ let sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A=="; }; }; - "webpack-cli-3.3.8" = { + "webpack-cli-3.3.9" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz"; - sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz"; + sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A=="; }; }; "webpack-core-0.6.9" = { @@ -44592,17 +44763,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.3.4"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz"; - sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.5.tgz"; + sha512 = "gKzYV5YhypXKpt4vH/YJ/T7a72EqxTJynJ8dtoVsZw5YTdCzqa6APvObNs4lZaZ3pYxUOQr36W4Rz8Lv8CSBWA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.803.4" - sources."@angular-devkit/core-8.3.4" - sources."@angular-devkit/schematics-8.3.4" - sources."@schematics/angular-8.3.4" - sources."@schematics/update-0.803.4" + sources."@angular-devkit/architect-0.803.5" + sources."@angular-devkit/core-8.3.5" + sources."@angular-devkit/schematics-8.3.5" + sources."@schematics/angular-8.3.5" + sources."@schematics/update-0.803.5" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -44734,7 +44905,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mississippi-3.0.0" sources."mkdirp-0.5.1" @@ -44846,7 +45017,7 @@ in sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" @@ -44980,7 +45151,11 @@ in sources."clean-git-ref-1.0.3" sources."clone-2.1.2" sources."clone-buffer-1.0.0" - sources."clone-response-1.0.2" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) sources."clone-stats-1.0.0" (sources."cloneable-readable-1.1.3" // { dependencies = [ @@ -45000,7 +45175,7 @@ in sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."decamelize-1.2.0" - sources."decompress-response-3.3.0" + sources."decompress-response-4.2.1" sources."deep-freeze-node-1.1.3" sources."defer-to-connect-1.0.2" sources."define-properties-1.1.3" @@ -45059,7 +45234,12 @@ in }) sources."globalyzer-0.1.4" sources."globrex-0.1.2" - sources."got-9.6.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."decompress-response-3.3.0" + sources."mimic-response-1.0.1" + ]; + }) sources."graceful-fs-4.2.2" (sources."gulp-vinyl-zip-2.1.2" // { dependencies = [ @@ -45069,7 +45249,7 @@ in sources."through2-2.0.5" ]; }) - sources."handlebars-4.2.0" + sources."handlebars-4.2.1" sources."has-symbols-1.0.0" sources."http-cache-semantics-4.0.3" sources."ignore-5.1.4" @@ -45110,7 +45290,7 @@ in sources."matcher-2.0.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-response-1.0.1" + sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" sources."minimist-1.2.0" @@ -45120,7 +45300,7 @@ in sources."neo-async-2.6.1" sources."nick-0.1.3" sources."normalize-path-2.1.1" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" sources."now-and-later-2.0.1" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -45179,7 +45359,7 @@ in sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" sources."simple-concat-1.0.0" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" sources."source-map-0.6.1" sources."split-0.3.3" sources."split2-3.1.1" @@ -45347,11 +45527,11 @@ in sources."@babel/template-7.6.0" sources."@babel/traverse-7.6.0" sources."@babel/types-7.6.1" - sources."@hapi/address-2.1.1" + sources."@hapi/address-2.1.2" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.2.4" sources."@hapi/joi-15.1.1" - sources."@hapi/topo-3.1.3" + sources."@hapi/topo-3.1.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@protobufjs/aspromise-1.1.2" @@ -45531,7 +45711,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."commondir-1.0.1" @@ -45618,7 +45798,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.1" - sources."electron-to-chromium-1.3.260" + sources."electron-to-chromium-1.3.264" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -45699,7 +45879,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.107.0" + sources."flow-parser-0.108.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -45741,7 +45921,7 @@ in sources."got-6.7.1" sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" - sources."graphql-14.5.6" + sources."graphql-14.5.7" (sources."graphql-anywhere-4.2.4" // { dependencies = [ sources."ts-invariant-0.3.3" @@ -46583,7 +46763,7 @@ in sources."chmodr-1.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" @@ -47142,7 +47322,7 @@ in sources."agent-base-4.3.0" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.44" + sources."big-integer-1.6.45" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -47253,7 +47433,7 @@ in sources."whatwg-url-7.0.0" ]; }) - sources."decompress-response-3.3.0" + sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -47305,7 +47485,7 @@ in sources."lodash.sortby-4.7.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-response-1.0.1" + sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -47351,7 +47531,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" @@ -47672,7 +47852,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.10" sources."parents-1.0.1" - sources."parse-asn1-5.1.4" + sources."parse-asn1-5.1.5" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -48246,7 +48426,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."commander-2.20.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" @@ -48293,7 +48473,7 @@ in sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colornames-1.1.1" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."colorspace-1.1.2" sources."commander-2.19.0" sources."core-util-is-1.0.2" @@ -48395,7 +48575,7 @@ in }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.44" + sources."big-integer-1.6.45" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -49407,7 +49587,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.6" @@ -49437,7 +49617,7 @@ in sources."symbol-observable-1.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."type-1.0.3" + sources."type-1.2.0" sources."util-deprecate-1.0.2" (sources."variable-diff-1.1.0" // { dependencies = [ @@ -49461,10 +49641,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz"; - sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.2.tgz"; + sha512 = "y5wgEQwt6IpUP1N64uorVavhp8NPUAamVqA/paZmpvPSrW3l2c5UhXRi5m61plBBzDde2WyDr+3vCwDsfaS03w=="; }; dependencies = [ sources."ansi-escapes-3.2.0" @@ -49761,7 +49941,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -49796,7 +49976,7 @@ in sources."dat-swarm-defaults-1.0.2" sources."debug-4.1.1" sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" + sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" @@ -50006,7 +50186,7 @@ in sources."mime-2.4.4" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-response-1.0.1" + sources."mimic-response-2.0.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -50139,7 +50319,7 @@ in ]; }) sources."simple-concat-1.0.0" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" sources."simple-sha1-2.1.2" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" @@ -50234,7 +50414,7 @@ in sources."throttle-1.0.3" sources."thunky-1.0.3" sources."timed-out-4.0.1" - sources."timeout-refresh-1.0.0" + sources."timeout-refresh-1.0.1" sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -50491,13 +50671,54 @@ in bypassCache = true; reconstructLock = true; }; + dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { + name = "dockerfile-language-server-nodejs"; + packageName = "dockerfile-language-server-nodejs"; + version = "0.0.21"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz"; + sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA=="; + }; + dependencies = [ + sources."dockerfile-ast-0.0.16" + (sources."dockerfile-language-service-0.0.8" // { + dependencies = [ + (sources."dockerfile-utils-0.0.13" // { + dependencies = [ + sources."vscode-languageserver-types-3.6.0" + ]; + }) + ]; + }) + (sources."dockerfile-utils-0.0.11" // { + dependencies = [ + sources."dockerfile-ast-0.0.12" + sources."vscode-languageserver-types-3.6.0" + ]; + }) + sources."vscode-jsonrpc-4.0.0" + sources."vscode-languageserver-5.2.1" + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-1.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies."; + homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.9.1"; + version = "6.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz"; - sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.10.6.tgz"; + sha512 = "Zjrmui3KS2Fem8OyVNoN1pWOCvULJP88rl1RdnBA/lkBx7u15G0B7FIlzOwX7sjBuJcqb9G5K9FuJXPU3MEqZg=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -50506,7 +50727,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.529.0" + sources."aws-sdk-2.533.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.1" @@ -50534,7 +50755,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" - sources."ieee754-1.1.8" + sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-1.3.5" (sources."ip-address-6.1.0" // { @@ -50561,7 +50782,7 @@ in sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."p-queue-6.1.1" - sources."p-timeout-3.1.0" + sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."psl-1.4.0" @@ -50678,7 +50899,7 @@ in sources."fresh-0.5.2" sources."fsevents-2.0.7" sources."get-stream-4.1.0" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."has-ansi-2.0.0" sources."http-errors-1.7.3" sources."http-proxy-1.17.0" @@ -51085,7 +51306,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -51237,7 +51458,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -51962,7 +52183,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.3.3" + sources."colors-1.4.0" sources."minimist-1.2.0" ]; }) @@ -52606,7 +52827,7 @@ in sources."ms-2.1.2" ]; }) - sources."graphql-14.5.6" + sources."graphql-14.5.7" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -52756,7 +52977,7 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - (sources."minipass-2.6.2" // { + (sources."minipass-2.8.1" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -52924,7 +53145,7 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" - (sources."tar-4.4.10" // { + (sources."tar-4.4.11" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -53298,7 +53519,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.2.1" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.16" + sources."blessed-contrib-4.8.17" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-1.0.0" @@ -53335,7 +53556,7 @@ in sources."lodash.assign-4.2.0" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" - sources."marked-0.6.3" + sources."marked-0.7.0" sources."marked-terminal-1.7.0" sources."memory-streams-0.1.3" sources."memorystream-0.3.1" @@ -53781,7 +54002,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."to-through-2.0.0" - sources."type-1.0.3" + sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."undertaker-1.2.1" @@ -54131,7 +54352,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."type-1.0.3" + sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -54334,10 +54555,10 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" - sources."eventemitter3-3.1.2" + sources."eventemitter3-4.0.0" sources."follow-redirects-1.9.0" sources."he-1.2.0" - sources."http-proxy-1.17.0" + sources."http-proxy-1.18.0" sources."mime-1.6.0" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -54525,26 +54746,26 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "5.2.8"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz"; - sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.4.1.tgz"; + sha512 = "z4Zdb1lEZoqx6HsURVgdqGw0INtDeNrbahTZacrqm3cNmjq6X4SOP+dILIeZoURq/V0KcyVcVQnssWRFbVd8TQ=="; }; dependencies = [ - sources."@ionic/cli-framework-2.1.6" - sources."@ionic/discover-2.0.5" - sources."@ionic/utils-array-1.2.0" - sources."@ionic/utils-fs-2.0.6" - sources."@ionic/utils-network-1.0.4" - sources."@ionic/utils-object-1.0.4" - sources."@ionic/utils-process-1.0.4" - sources."@ionic/utils-stream-2.0.3" - sources."@ionic/utils-subprocess-1.0.7" - sources."@ionic/utils-terminal-1.0.4" + sources."@ionic/cli-framework-2.1.7" + sources."@ionic/discover-2.0.6" + sources."@ionic/utils-array-1.2.1" + sources."@ionic/utils-fs-2.0.7" + sources."@ionic/utils-network-1.0.5" + sources."@ionic/utils-object-1.0.5" + sources."@ionic/utils-process-1.0.5" + sources."@ionic/utils-stream-2.0.4" + sources."@ionic/utils-subprocess-1.0.8" + sources."@ionic/utils-terminal-1.0.5" sources."@types/node-8.10.54" sources."agent-base-4.3.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-escapes-4.2.1" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."astral-regex-1.0.0" @@ -54556,7 +54777,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."chownr-1.1.2" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."cli-width-2.2.0" sources."co-4.6.0" sources."color-convert-1.9.3" @@ -54566,11 +54787,7 @@ in sources."concat-map-0.0.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.0" sources."data-uri-to-buffer-2.0.1" sources."debug-4.1.1" sources."deep-is-0.1.3" @@ -54595,11 +54812,17 @@ in sources."esprima-3.1.3" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."semver-5.7.1" + ]; + }) sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-2.0.0" + sources."figures-3.0.0" sources."file-uri-to-path-1.0.0" sources."form-data-2.5.1" sources."formidable-1.2.1" @@ -54634,15 +54857,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.5.2" // { - dependencies = [ - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."inquirer-7.0.0" sources."ip-1.1.5" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" @@ -54673,6 +54888,11 @@ in sources."lodash.restparam-3.6.1" (sources."log-update-3.3.0" // { dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cli-cursor-2.1.0" + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" sources."string-width-3.1.0" sources."wrap-ansi-5.1.0" ]; @@ -54683,10 +54903,10 @@ in sources."mime-2.4.4" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.6.2" // { + (sources."minipass-2.8.1" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -54698,12 +54918,16 @@ in ]; }) sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."netmask-1.0.6" sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.0" sources."open-6.4.0" sources."optionator-0.8.2" sources."os-name-3.1.0" @@ -54716,7 +54940,7 @@ in }) sources."pac-resolver-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.0" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" (sources."proxy-agent-3.1.0" // { @@ -54727,10 +54951,10 @@ in sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."raw-body-2.4.1" sources."readable-stream-3.4.0" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."rimraf-3.0.0" sources."rsvp-3.6.2" sources."run-async-2.3.0" @@ -54769,11 +54993,7 @@ in ]; }) sources."string_decoder-1.3.0" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."superagent-4.1.0" (sources."superagent-proxy-2.0.0" // { @@ -54782,7 +55002,7 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.10" // { + (sources."tar-4.4.11" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -54795,6 +55015,7 @@ in sources."tree-kill-1.2.1" sources."tslib-1.10.0" sources."type-check-0.3.2" + sources."type-fest-0.5.2" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -55056,7 +55277,7 @@ in }) sources."debug-3.2.6" sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" + sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-2.2.1" @@ -55229,10 +55450,10 @@ in sources."mime-2.4.4" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-response-1.0.1" + sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."moment-2.24.0" @@ -55348,7 +55569,7 @@ in sources."sharp-0.22.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" sources."simple-swizzle-0.2.2" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -55392,7 +55613,7 @@ in sources."symbol-tree-3.2.4" sources."syswide-cas-5.3.0" sources."table-layout-0.4.5" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."tar-fs-2.0.0" (sources."tar-stream-2.1.0" // { dependencies = [ @@ -55721,7 +55942,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -55907,7 +56128,7 @@ in sources."ms-2.0.0" sources."nanoid-2.1.1" sources."negotiator-0.6.2" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -56084,8 +56305,8 @@ in sources."buffer-fill-1.0.0" sources."bytes-3.1.0" sources."callsite-1.0.0" - sources."chokidar-3.1.0" - sources."colors-1.3.3" + sources."chokidar-3.1.1" + sources."colors-1.4.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -56115,7 +56336,7 @@ in sources."engine.io-parser-2.1.3" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-3.1.2" + sources."eventemitter3-4.0.0" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -56130,12 +56351,12 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.0.7" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."graceful-fs-4.2.2" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" - sources."http-proxy-1.17.0" + sources."http-proxy-1.18.0" sources."iconv-lite-0.4.24" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -56372,7 +56593,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -56709,7 +56930,7 @@ in ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.9" + sources."@octokit/rest-16.30.0" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" @@ -57014,7 +57235,7 @@ in sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."glob-to-regexp-0.3.0" (sources."globby-9.2.0" // { dependencies = [ @@ -57022,7 +57243,7 @@ in ]; }) sources."graceful-fs-4.2.2" - (sources."handlebars-4.2.0" // { + (sources."handlebars-4.2.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -57163,7 +57384,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minimist-options-3.0.2" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { @@ -57197,7 +57418,7 @@ in }) sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-3.1.3" + sources."npm-lifecycle-3.1.4" (sources."npm-package-arg-6.1.1" // { dependencies = [ sources."semver-5.7.1" @@ -57448,7 +57669,7 @@ in ]; }) sources."supports-color-5.5.0" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."temp-dir-1.0.0" sources."temp-write-3.4.0" sources."text-extensions-2.0.0" @@ -57717,7 +57938,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."component-emitter-1.3.0" sources."connect-3.7.0" sources."copy-descriptor-0.1.1" @@ -58018,7 +58239,7 @@ in ]; }) sources."base64-arraybuffer-0.1.5" - sources."base64id-1.0.0" + sources."base64id-2.0.0" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.13.1" @@ -58078,19 +58299,22 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.3.2" // { + (sources."engine.io-3.4.0" // { dependencies = [ sources."cookie-0.3.1" - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.3.2" // { + (sources."engine.io-client-3.4.0" // { dependencies = [ sources."component-emitter-1.2.1" - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.1.3" + sources."engine.io-parser-2.2.0" sources."entities-1.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -58384,24 +58608,33 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.2.0" // { + (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.2.0" // { + (sources."socket.io-client-2.3.0" // { dependencies = [ sources."component-emitter-1.2.1" - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) ]; }) - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.4.0" // { dependencies = [ sources."component-emitter-1.2.1" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."isarray-2.0.1" + sources."ms-2.1.2" ]; }) sources."source-map-0.5.7" @@ -58468,7 +58701,7 @@ in sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-6.1.4" + sources."ws-7.1.2" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -58949,7 +59182,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.260" + sources."electron-to-chromium-1.3.264" sources."elliptic-6.5.1" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -59140,7 +59373,7 @@ in }) sources."get-stream-4.1.0" sources."http-cache-semantics-4.0.3" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" sources."p-cancelable-1.1.0" ]; }) @@ -59386,7 +59619,7 @@ in sources."pako-1.0.10" sources."parallel-transform-1.2.0" sources."paredit.js-0.3.4" - sources."parse-asn1-5.1.4" + sources."parse-asn1-5.1.5" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" sources."parse-passwd-1.0.0" @@ -59777,7 +60010,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.8" // { + (sources."webpack-cli-3.3.9" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -60662,7 +60895,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.0.3" + sources."type-1.2.0" sources."typescript-3.5.3" (sources."uglify-js-3.4.9" // { dependencies = [ @@ -60918,7 +61151,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -61062,7 +61295,7 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."nopt-3.0.6" @@ -61089,7 +61322,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-4.4.10" + sources."tar-4.4.11" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -61162,7 +61395,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.44" + sources."big-integer-1.6.45" sources."block-stream-0.0.9" sources."body-parser-1.19.0" sources."boom-2.10.1" @@ -61471,7 +61704,7 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ms-2.1.2" @@ -61505,7 +61738,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -61809,7 +62042,7 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.6.2" // { + (sources."minipass-2.8.1" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -61950,7 +62183,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tail-2.0.3" - (sources."tar-4.4.10" // { + (sources."tar-4.4.11" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -61973,7 +62206,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" - sources."type-1.0.3" + sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uc.micro-1.0.6" @@ -62108,7 +62341,7 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ncp-0.4.2" @@ -62181,7 +62414,7 @@ in ]; }) sources."strip-ansi-3.0.1" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."temp-0.9.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62740,7 +62973,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mississippi-3.0.0" sources."mkdirp-0.5.1" @@ -62760,7 +62993,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" sources."npm-bundled-1.0.6" (sources."npm-package-arg-6.1.1" // { dependencies = [ @@ -62886,7 +63119,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."term-size-1.2.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -63528,7 +63761,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.260" + sources."electron-to-chromium-1.3.264" sources."elliptic-6.5.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -63798,7 +64031,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."pako-0.2.9" - sources."parse-asn1-5.1.4" + sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" sources."parse5-5.1.0" sources."parseurl-1.3.3" @@ -64146,7 +64379,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.44" + sources."big-integer-1.6.45" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -64466,7 +64699,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64-js-1.3.1" - sources."base64id-1.0.0" + sources."base64id-2.0.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-0.7.0" @@ -64535,18 +64768,21 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - (sources."engine.io-3.3.2" // { + (sources."engine.io-3.4.0" // { dependencies = [ sources."cookie-0.3.1" - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.3.2" // { + (sources."engine.io-client-3.4.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.1.3" + sources."engine.io-parser-2.2.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.17.1" @@ -64719,22 +64955,31 @@ in sources."ws-2.3.1" ]; }) - (sources."socket.io-2.2.0" // { + (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.2.0" // { + (sources."socket.io-client-2.3.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) ]; }) - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.4.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" sources."isarray-2.0.1" + sources."ms-2.1.2" ]; }) sources."speedometer-0.1.4" @@ -64777,7 +65022,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-6.1.4" + sources."ws-7.1.2" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -64886,7 +65131,7 @@ in sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" sources."cipher-base-1.0.4" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -64980,7 +65225,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.10" sources."parents-1.0.1" - sources."parse-asn1-5.1.4" + sources."parse-asn1-5.1.5" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -65483,13 +65728,13 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.52.0"; + version = "1.52.2"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz"; - sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.52.2.tgz"; + sha512 = "JLRh52heei1kiTg/mdXdVeJXlB26nXI6uK3/jQvG2a16WwrXD+h033azkD9qqk7WgISLgDKPJbvlnsCAXLcX5Q=="; }; dependencies = [ - sources."@serverless/cli-1.2.1" + sources."@serverless/cli-1.2.3" (sources."@serverless/component-metrics-1.0.8" // { dependencies = [ sources."node-fetch-2.6.0" @@ -65501,7 +65746,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-2.0.0" // { + (sources."@serverless/enterprise-plugin-3.0.0" // { dependencies = [ sources."fs-extra-7.0.1" sources."node-fetch-2.6.0" @@ -65549,10 +65794,9 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.529.0" // { + (sources."aws-sdk-2.533.0" // { dependencies = [ sources."buffer-4.9.1" - sources."ieee754-1.1.8" sources."uuid-3.3.2" ]; }) @@ -65591,7 +65835,7 @@ in sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-3.1.0" + sources."chokidar-3.1.1" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -65753,11 +65997,11 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."global-dirs-0.1.1" sources."globby-6.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.2" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.7" (sources."has-ansi-2.0.0" // { @@ -65829,7 +66073,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-windows-1.0.2" - sources."is-wsl-2.1.0" + sources."is-wsl-2.1.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."iso8601-duration-1.2.0" @@ -65908,7 +66152,7 @@ in sources."node-dir-0.1.17" sources."node-fetch-1.7.3" sources."normalize-path-3.0.0" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -66155,7 +66399,7 @@ in sources."trim-repeated-1.0.0" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" - sources."type-1.0.3" + sources."type-1.2.0" sources."type-fest-0.5.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -66843,10 +67087,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.227.0"; + version = "1.228.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz"; - sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz"; + sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA=="; }; dependencies = [ sources."@snyk/cli-interface-2.1.0" @@ -67153,7 +67397,7 @@ in sources."debug-4.1.1" ]; }) - (sources."snyk-gradle-plugin-3.0.2" // { + (sources."snyk-gradle-plugin-3.1.0" // { dependencies = [ sources."debug-4.1.1" ]; @@ -67286,10 +67530,10 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz"; - sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz"; + sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; dependencies = [ sources."accepts-1.3.7" @@ -67298,7 +67542,7 @@ in sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" - sources."base64id-1.0.0" + sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" sources."callsite-1.0.0" @@ -67307,19 +67551,13 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-4.1.1" - (sources."engine.io-3.3.2" // { + sources."engine.io-3.4.0" + (sources."engine.io-client-3.4.0" // { dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."engine.io-client-3.3.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" + sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.1.3" + sources."engine.io-parser-2.2.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" @@ -67332,20 +67570,19 @@ in sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.2.0" // { + (sources."socket.io-client-2.3.0" // { dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."socket.io-parser-3.3.0" // { - dependencies = [ - sources."debug-3.1.0" sources."ms-2.0.0" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) ]; }) + sources."socket.io-parser-3.4.0" sources."to-array-0.1.4" - sources."ws-6.1.4" + sources."ws-7.1.2" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -67668,7 +67905,7 @@ in sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.0" sources."deep-extend-0.6.0" - (sources."deferred-leveldown-5.2.0" // { + (sources."deferred-leveldown-5.2.1" // { dependencies = [ sources."abstract-leveldown-6.1.1" ]; @@ -67865,7 +68102,7 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."leveldown-5.2.0" // { + (sources."leveldown-5.2.1" // { dependencies = [ sources."abstract-leveldown-6.1.1" ]; @@ -68429,7 +68666,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.529.0" // { + (sources."aws-sdk-2.533.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -68449,7 +68686,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64-js-1.3.1" - sources."base64id-1.0.0" + sources."base64id-2.0.0" sources."base64url-3.0.1" sources."basic-auth-1.1.0" sources."bcrypt-pbkdf-1.0.2" @@ -68553,19 +68790,21 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - (sources."engine.io-3.3.2" // { + (sources."engine.io-3.4.0" // { dependencies = [ - sources."debug-3.1.0" - sources."ws-6.1.4" + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."ws-7.1.2" ]; }) - (sources."engine.io-client-3.3.2" // { + (sources."engine.io-client-3.4.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.2" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.1.3" + sources."engine.io-parser-2.2.0" sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -68655,15 +68894,15 @@ in sources."inherits-2.0.3" ]; }) - (sources."http-proxy-1.17.0" // { + (sources."http-proxy-1.18.0" // { dependencies = [ - sources."eventemitter3-3.1.2" + sources."eventemitter3-4.0.0" ]; }) sources."http-signature-1.1.1" sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.8" + sources."ieee754-1.1.13" sources."in-publish-2.0.0" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -68952,22 +69191,31 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."sntp-1.0.9" - (sources."socket.io-2.2.0" // { + (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.2.0" // { + (sources."socket.io-client-2.3.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) ]; }) - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.4.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" sources."isarray-2.0.1" + sources."ms-2.1.2" ]; }) sources."source-map-0.6.1" @@ -69012,7 +69260,7 @@ in sources."debug-3.2.6" sources."form-data-2.5.1" sources."ms-2.1.2" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -69025,7 +69273,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.8.0" + sources."qs-6.9.0" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -69474,7 +69722,7 @@ in ]; }) sources."growl-1.9.2" - (sources."handlebars-4.2.0" // { + (sources."handlebars-4.2.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -69657,7 +69905,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.8.0" + sources."qs-6.9.0" sources."superagent-3.8.3" ]; }) @@ -71236,7 +71484,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -71259,7 +71507,7 @@ in ]; }) sources."nopt-4.0.1" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.4" sources."npmlog-4.1.2" @@ -71353,7 +71601,7 @@ in sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."supports-color-5.5.0" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."thelounge-ldapjs-non-maintained-fork-1.0.4" sources."tlds-1.203.1" sources."to-array-0.1.4" @@ -71781,7 +72029,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."diff-2.2.3" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -72524,7 +72772,7 @@ in sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.2.0" + sources."handlebars-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -73820,7 +74068,7 @@ in dependencies = [ sources."get-stream-5.1.0" sources."lowercase-keys-2.0.0" - sources."normalize-url-4.3.0" + sources."normalize-url-4.4.1" ]; }) (sources."caller-path-0.1.0" // { @@ -74694,7 +74942,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.227.0" // { + (sources."snyk-1.228.3" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -74723,7 +74971,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."snyk-gradle-plugin-3.0.2" // { + (sources."snyk-gradle-plugin-3.1.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74903,7 +75151,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.0.3" + sources."type-1.2.0" sources."type-check-0.3.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" @@ -75321,7 +75569,7 @@ in sources."p-try-2.2.0" sources."pako-1.0.10" sources."parallel-transform-1.2.0" - sources."parse-asn1-5.1.4" + sources."parse-asn1-5.1.5" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -75509,10 +75757,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz"; - sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz"; + sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -75879,8 +76127,10 @@ in (sources."bittorrent-tracker-9.14.4" // { dependencies = [ sources."debug-4.1.1" + sources."decompress-response-4.2.1" + sources."mimic-response-2.0.0" sources."ms-2.1.2" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" ]; }) sources."blob-to-buffer-1.2.8" @@ -75981,7 +76231,9 @@ in sources."last-one-wins-1.0.4" (sources."load-ip-set-2.1.0" // { dependencies = [ - sources."simple-get-3.0.3" + sources."decompress-response-4.2.1" + sources."mimic-response-2.0.0" + sources."simple-get-3.1.0" ]; }) sources."long-4.0.0" @@ -76026,7 +76278,9 @@ in sources."parse-numeric-range-0.0.2" (sources."parse-torrent-7.0.1" // { dependencies = [ - sources."simple-get-3.0.3" + sources."decompress-response-4.2.1" + sources."mimic-response-2.0.0" + sources."simple-get-3.1.0" ]; }) sources."path-is-absolute-1.0.1" @@ -76067,7 +76321,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.5.0" // { + (sources."simple-peer-9.6.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -76123,8 +76377,10 @@ in (sources."webtorrent-0.107.16" // { dependencies = [ sources."debug-4.1.1" + sources."decompress-response-4.2.1" + sources."mimic-response-2.0.0" sources."ms-2.1.2" - sources."simple-get-3.0.3" + sources."simple-get-3.1.0" ]; }) sources."winreg-1.2.4" @@ -76431,7 +76687,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.1.0" // { + (sources."global-agent-2.1.1" // { dependencies = [ sources."semver-6.3.0" ]; diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 63b388f88eb..dcc1c73c0fc 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1255,13 +1255,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minipass-2.6.2" = { + "minipass-2.8.1" = { name = "minipass"; packageName = "minipass"; - version = "2.6.2"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz"; - sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz"; + sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg=="; }; }; "minizlib-1.2.2" = { @@ -2038,13 +2038,13 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; - "tar-4.4.10" = { + "tar-4.4.11" = { name = "tar"; packageName = "tar"; - version = "4.4.10"; + version = "4.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; - sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz"; + sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA=="; }; }; "temp-0.9.0" = { @@ -2675,7 +2675,7 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.6.2" + sources."minipass-2.8.1" sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ncp-0.4.2" @@ -2748,7 +2748,7 @@ in ]; }) sources."strip-ansi-3.0.1" - sources."tar-4.4.10" + sources."tar-4.4.11" sources."temp-0.9.0" (sources."tough-cookie-2.4.3" // { dependencies = [ diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 98fd7fc46cf..1b465c2984e 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,53 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, result -, qcheck }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, iter, result, uchar +, gen, mdx, ounit, qcheck, uutf +}: -let - - mkpath = p: - "${p}/lib/ocaml/${ocaml.version}/site-lib"; - - version = "1.4"; - -in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-containers-${version}"; +buildDunePackage rec { + version = "2.6.1"; + pname = "containers"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = version; - sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i"; + sha256 = "02iq01pq6047hab5s8zpprwr21cygvzfcfj2lpsyj823f28crhmv"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ]; - - propagatedBuildInputs = [ result ]; - - preConfigure = '' - # The following is done so that the '#use "topfind"' directive works in the ocaml top-level - export HOME="$(mktemp -d)" - export OCAML_TOPLEVEL_PATH="${mkpath findlib}" - cat <<EOF > $HOME/.ocamlinit -let () = - try Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH") - with Not_found -> () -;; -EOF - ''; + buildInputs = [ iter ]; - configureFlags = [ - "--enable-unix" - "--enable-thread" - "--enable-tests" - "--enable-docs" - "--disable-bench" - ]; + checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ]; - doCheck = true; - checkTarget = "test"; + propagatedBuildInputs = [ result uchar ]; - createFindlibDestdir = true; + doCheck = !lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = https://github.com/c-cube/ocaml-containers; @@ -62,7 +35,6 @@ EOF It also features optional libraries for dealing with strings, and helpers for unix and threads. ''; - license = stdenv.lib.licenses.bsd2; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 8180373a3dd..8181433e1ee 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = { homepage = http://pauillac.inria.fr/~xleroy/software.html; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index e5ead36d1c1..eb2ca1409ab 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, qtest, result }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, qtest, result }: buildDunePackage rec { - pname = "sequence"; - version = "1.1"; - - minimumOCamlVersion = "4.02"; + pname = "iter"; + version = "1.2.1"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = version; - sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44"; + sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; }; - buildInputs = [ qtest ]; + buildInputs = lib.optionals doCheck [ mdx qtest ]; propagatedBuildInputs = [ result ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { homepage = https://github.com/c-cube/sequence; @@ -27,6 +25,6 @@ buildDunePackage rec { like `filter`, `map`, `take`, `drop` and `append` can be performed before the sequence is iterated/folded on. ''; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 29fee1b6318..0b43cf461e0 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; version = "1.4.0"; - minimumOCamlVersion = "4.05"; - src = fetchFromGitHub { owner = "realworldocaml"; repo = pname; @@ -15,14 +13,16 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ]; - checkInputs = [ ocaml_lwt pandoc ]; + checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ]; + + doCheck = !lib.versionAtLeast ocaml.version "4.08"; - doCheck = true; + dontStrip = lib.versions.majorMinor ocaml.version == "4.04"; meta = { homepage = https://github.com/realworldocaml/mdx; description = "Executable OCaml code blocks inside markdown files"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix new file mode 100644 index 00000000000..1ef7b6c2d40 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -0,0 +1,38 @@ +{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocaml-protoc-${version}"; + version = "1.2.0"; + + minimumOCamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mransan"; + repo = "ocaml-protoc"; + rev = "60d2d4dd55f73830e1bed603cc44d3420430632c"; + sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj"; + }; + + installPhase = '' + mkdir -p tmp/bin + export PREFIX=`pwd`/tmp + make all.install.build + make check_install + make lib.install + make bin.install + ''; + + buildInputs = [ ocaml findlib ocamlbuild ]; + propagatedBuildInputs = [ ppx_deriving_protobuf ]; + + createFindlibDestdir = true; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/mransan/ocaml-protoc"; + description = "A Protobuf Compiler for OCaml"; + license = licenses.mit; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 9499bff84a1..df484b230c2 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 0b342a654e6..75a2dab970e 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo, bos, cmdliner, tyxml }: +{ lib, fetchFromGitHub, buildDunePackage +, astring, cmdliner, cppo, fpath, result, tyxml +}: buildDunePackage rec { pname = "odoc"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "0hjan5aj5zk8j8qyagv9r4hqm469mh207cv2m6kxwgnw0c3cz7sy"; + sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i"; }; - buildInputs = [ cppo bos cmdliner tyxml ]; + buildInputs = [ astring cmdliner cppo fpath result tyxml ]; meta = { description = "A documentation generator for OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 613973200d2..508bbfba605 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -1,28 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, dune }: +{ lib, buildDunePackage, fetchurl }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "optint is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.0.2"; - name = "ocaml${ocaml.version}-optint-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + version = "0.0.3"; + pname = "optint"; src = fetchurl { - url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz"; - sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1"; + url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz"; + sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj"; }; - buildInputs = [ ocaml findlib dune ]; - - buildPhase = "dune build"; - - inherit (dune) installPhase; - meta = { homepage = "https://github.com/mirage/optint"; description = "Abstract type of integer between x64 and x86 architecture"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 7ac6af3edd9..9eb81003d47 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-owee-${version}"; - version = "0.2"; +buildDunePackage rec { + minimumOCamlVersion = "4.06"; + pname = "owee"; + version = "0.3"; src = fetchFromGitHub { owner = "let-def"; repo = "owee"; rev = "v${version}"; - sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z"; + sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j"; }; - buildInputs = [ ocaml findlib ]; - - createFindlibDestdir = true; - meta = { description = "An experimental OCaml library to work with DWARF format"; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix new file mode 100644 index 00000000000..7746200d4ff --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }: + +buildDunePackage rec { + pname = "ppx_deriving_rpc"; + + inherit (rpclib) version src; + + buildInputs = [ ppxfind cppo ]; + + propagatedBuildInputs = [ rpclib ppx_deriving ]; + + meta = with lib; { + homepage = "https://github.com/mirage/ocaml-rpc"; + description = "Ppx deriver for ocaml-rpc"; + license = licenses.isc; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 53e8265c3a7..d8a8f22ae70 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.3"; + version = "3.5.1"; minimumOCamlVersion = "4.04"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz"; + sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh"; }; buildInputs = [ ppxfind ounit ]; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index b4b733ed7d8..50866e1d969 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, mdx }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }: buildDunePackage rec { pname = "printbox"; @@ -13,14 +13,14 @@ buildDunePackage rec { sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n"; }; - checkInputs = [ mdx ]; + checkInputs = lib.optional doCheck mdx; - doCheck = true; + doCheck = !lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = https://github.com/c-cube/printbox/; description = "Allows to print nested boxes, lists, arrays, tables in several formats"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 1eb789ec269..6b1b45cb2fb 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, owee }: +{ lib, fetchFromGitHub, buildDunePackage, owee }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" -then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-spacetime_lib-${version}"; - version = "0.1.0"; +buildDunePackage rec { + pname = "spacetime_lib"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lpw25"; repo = "spacetime_lib"; rev = version; - sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5"; + sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ owee ]; - createFindlibDestdir = true; - meta = { description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles"; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 866c0410929..503fefc0013 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { py.test tests ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { homepage = https://pythonhosted.org/Logbook/; description = "A logging replacement for Python"; diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix new file mode 100644 index 00000000000..4b4986795ce --- /dev/null +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }: + +buildPythonPackage rec { + pname = "algebraic-data-types"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jspahrsummers"; + repo = "adt"; + rev = "v" + version; + sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi"; + }; + + disabled = pythonOlder "3.6"; + + checkInputs = [ + hypothesis + mypy + ]; + + meta = with lib; { + description = "Algebraic data types for Python"; + homepage = https://github.com/jspahrsummers/adt; + license = licenses.mit; + maintainers = with maintainers; [ uri-canva ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index f46ca274f2e..35bb7b1aa59 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { pytest ''; + # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s + doCheck = false; + meta = { description = "Astronomy/Astrophysics library for Python"; homepage = https://www.astropy.org; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 9e761b3698d..4912e8f9994 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -2,12 +2,12 @@ , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: buildPythonPackage rec { - version = "1.12.3"; pname = "aws-adfs"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831"; + sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54"; }; # Relax version constraint @@ -24,10 +24,10 @@ buildPythonPackage rec { checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; propagatedBuildInputs = [ lxml boto3 requests click configparser ]; - meta = { + meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; homepage = https://github.com/venth/aws-adfs; - license = lib.licenses.psfl; - maintainers = [ lib.maintainers.bhipple ]; + license = licenses.psfl; + maintainers = [ maintainers.bhipple ]; }; } diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index f91b33d2010..574aeefa7fc 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -19,8 +19,8 @@ }@args: import ./generic.nix ({ - version = "1.0.2"; - sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; + version = "1.1.0"; + sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i"; dlopen_patch = ./dlopen-paths.patch; disabled = pythonOlder "3.5"; inherit withXcffib; diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index 10e2294981d..6542b4367eb 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -1,46 +1,61 @@ -commit 0435bc2577d4b18f54b78b2f5185abb2b2005982 -Author: Alexander V. Nikolaev <avn@avnik.info> -Date: Sat Feb 6 08:09:06 2016 +0200 +Patch dlopen() to allow direct paths to all required libs - Patch dlopen() to allow direct paths to all required libs +This is an update of the patch submitted in +https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 +by Alexander V. Nikolaev <avn@avnik.info> - This patch is NixOS specific +--- + cairocffi/__init__.py | 34 ++++++++++++++++------------------ + 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py -index 6061973..3538a58 100644 +index 307d58c..43c29e3 100644 --- a/cairocffi/__init__.py +++ b/cairocffi/__init__.py -@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() - version = '1.16.0' - version_info = (1, 16, 0) +@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() + version = '1.17.2' + version_info = (1, 17, 2) -+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime ++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be ++# required for runtime +_LIBS = { + 'cairo': '@cairo@/lib/libcairo@ext@', + 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', + 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} ++ --def dlopen(ffi, *names): -+def dlopen(ffi, name, *names): + def dlopen(ffi, library_names, filenames): """Try various names for the same library, for different platforms.""" -- for name in names: -- for lib_name in (name, 'lib' + name): -- try: -- path = ctypes.util.find_library(lib_name) -- lib = ffi.dlopen(path or lib_name) -- if lib: -- return lib -- except OSError: -- pass -- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) -+ path = _LIBS.get(name, None) -+ if path: -+ lib = ffi.dlopen(path) -+ if lib: -+ return lib -+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) +- exceptions = [] +- + for library_name in library_names: +- library_filename = find_library(library_name) +- if library_filename: +- filenames = (library_filename,) + filenames +- else: +- exceptions.append( +- 'no library called "{}" was found'.format(library_name)) +- +- for filename in filenames: +- try: +- return ffi.dlopen(filename) +- except OSError as exception: # pragma: no cover +- exceptions.append(exception) +- +- error_message = '\n'.join( # pragma: no cover +- str(exception) for exception in exceptions) +- raise OSError(error_message) # pragma: no cover ++ path = _LIBS.get(library_name, None) ++ if path: ++ lib = ffi.dlopen(path) ++ if lib: ++ return lib ++ ++ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path)) - cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2') + cairo = dlopen( +-- +2.19.2 diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 591bb0fbe37..9b3050942a8 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -34,6 +34,9 @@ buildPythonPackage rec { pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index ab9ca982718..0e5e902be2e 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy3k , pytestrunner , click , dateparser @@ -12,17 +13,16 @@ buildPythonPackage rec { pname = "csvs-to-sqlite"; - version = "0.9"; + version = "1.0"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5"; + sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm"; }; - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ click dateparser diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index af2607bca14..e135d8c7bc6 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.6"; + version = "3.14.10"; src = fetchPypi { inherit pname version; - sha256 = "2e1889a0981381f557b0d14cba900adf7476817c53c13bfb04e2a30b3db0f1d3"; + sha256 = "1c475axh40f8s4n5dqm52qczx9g2g8b8wsy0qvghirk84ikpca5y"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index d4cd0e711a0..f3e4e0a8b73 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" "" ''; + dontUseCmakeConfigure = true; + # Python 3 works but has a broken import test that I couldn't # figure out. doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d61f5a77600..693e733e73a 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.17.0"; + version = "3.23.0"; src = fetchPypi { inherit pname version; - sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3"; + sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj"; }; - propagatedBuildInputs = [ flask pyjwt werkzeug ]; + propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix deleted file mode 100644 index 58705751415..00000000000 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, flask, oauthlib, requests_oauthlib, flask_sqlalchemy -, mock, nose}: -buildPythonPackage rec { - pname = "Flask-OAuthlib"; - version = "0.9.5"; - - src = fetchFromGitHub { - owner = "lepture"; - repo = "flask-oauthlib"; - rev = "v${version}"; - sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f"; - }; - - buildInputs = [ mock nose ]; - propagatedBuildInputs = [ - flask flask_sqlalchemy oauthlib requests_oauthlib - ]; - - checkPhase = "nosetests -d"; - doCheck = false; # request mocking fails - - meta = with stdenv.lib; { - description = "OAuthlib implementation for Flask"; - license = licenses.mit; - maintainers = [ maintainers.mic92 ]; - homepage = https://github.com/lepture/flask-oauthlib; - }; -} diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index aa7b40675b8..2ff84f2531b 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.3.2"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar"; + sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc"; }; propagatedBuildInputs = [ flask sqlalchemy ]; - checkInputs = [ pytest ]; + checkInputs = [ mock pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index f77c267d792..361ac0c59d1 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -23,6 +23,9 @@ buildPythonPackage rec { py.test ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 5203047b77f..4bdd9011d1e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "IPython Kernel for Jupyter"; homepage = http://ipython.org/; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index fe6382f6fb6..59d0d27b8b6 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, setuptools }: buildPythonPackage rec { pname = "iso-639"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; }; + propagatedBuildInputs = [ setuptools ]; + meta = with lib; { homepage = https://github.com/noumar/iso639; description = "ISO 639 library for Python"; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index e54283735a8..cf1eeb5392c 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,27 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools_scm, entrypoints, secretstorage +, dbus-python, setuptools_scm, entrypoints, secretstorage , pytest, pytest-flake8 }: buildPythonPackage rec { pname = "keyring"; - version = "18.0.1"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"; + sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a"; }; nativeBuildInputs = [ setuptools_scm ]; checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; + propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - doCheck = !stdenv.isDarwin; - - checkPhase = '' - py.test - ''; + # checks try to access a darwin path on linux + doCheck = false; meta = with stdenv.lib; { description = "Store and access your passwords safely"; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 3f9f58b5203..3e2c1f1356a 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex +, websocket_client }: buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.24"; + version = "0.1.28"; src = fetchPypi { inherit pname version; - sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026"; + sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd"; }; propagatedBuildInputs = [ - hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex + hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client ]; # No tests diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 6d52e5f5c1f..2bf204a9a62 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0"; }; + postPatch = "patchShebangs ./configure"; propagatedBuildInputs = [ boolean-py ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 816b3a67682..fca4366e8a0 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; - buildInputs = [ libxml2 libxslt ]; + propagatedBuildInputs = [ libxml2 libxslt ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index c5ca8e1f4b5..d4361baf903 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.701"; + version = "0.711"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p"; + sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 69828b2b18f..2f0090b5967 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py" ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "Converting Jupyter Notebooks"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 8b16ffb7e32..fbc71202d28 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { export HOME=tmp ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "The Jupyter Notebook format"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 60aa4806e2f..860142f1e94 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -45,6 +45,9 @@ buildPythonPackage rec { pytest tests --ignore tests/test_timeouts.py ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A py.test plugin to validate Jupyter notebooks"; homepage = https://github.com/computationalmodelling/nbval; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 10baadcab30..02e2a1b472a 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -4,8 +4,6 @@ , paramiko , selectors2 , lxml -, libxml2 -, libxslt , nose , rednose }: @@ -22,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ nose rednose ]; propagatedBuildInputs = [ - paramiko lxml libxml2 libxslt selectors2 + paramiko lxml selectors2 ]; checkPhase = '' diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 431d4bb4d56..d081a5a92fb 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -64,6 +64,9 @@ buildPythonPackage rec { else ""} ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 6d0cafd5f80..1fbddca8cc4 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.4.2"; + version = "1.9.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e"; + sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix new file mode 100644 index 00000000000..57fbe099071 --- /dev/null +++ b/pkgs/development/python-modules/picos/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, numpy +, cvxopt +, python +}: + +buildPythonPackage rec { + pname = "picos"; + version = "1.2.0"; + + src = fetchFromGitLab { + owner = "picos-api"; + repo = "picos"; + rev = "v${version}"; + sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z"; + }; + + propagatedBuildInputs = [ + numpy + cvxopt + ]; + + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with lib; { + description = "A Python interface to conic optimization solvers"; + homepage = https://gitlab.com/picos-api/picos; + license = licenses.gpl3; + maintainers = with maintainers; [ tobiasBora ]; + }; +} + diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 5da7a7941c0..7aa66c2a309 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { py.test --deselect=test_portend.py::TestChecker::test_check_port_listening ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = https://github.com/jaraco/portend; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 14fa0d2f59d..f19f2dfe265 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -1,22 +1,22 @@ { lib, buildPythonPackage, fetchPypi, - cssselect, cssutils, lxml, mock, nose, requests + cssselect, cssutils, lxml, mock, nose, requests, cachetools }: buildPythonPackage rec { pname = "premailer"; version = "3.3.0"; - meta = { - description = "Turns CSS blocks into style attributes "; - homepage = https://github.com/peterbe/premailer; - license = lib.licenses.bsd3; - }; - src = fetchPypi { inherit pname version; sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; - propagatedBuildInputs = [ cssselect cssutils lxml requests ]; + propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ]; + + meta = { + description = "Turns CSS blocks into style attributes "; + homepage = https://github.com/peterbe/premailer; + license = lib.licenses.bsd3; + }; } diff --git a/pkgs/development/python-modules/perf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 6c209ba8da0..51a08e1f7ea 100644 --- a/pkgs/development/python-modules/perf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - pname = "perf"; - version = "1.6.0"; + pname = "pyperf"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1vrv83v8rhyl51yaxlqzw567vz5a9qwkymk3vqvcl5sa2yd3mzgp"; + sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371"; }; checkInputs = [ nose psutil ] ++ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to generate and modify perf"; - homepage = https://github.com/vstinner/perf; + homepage = "https://pyperf.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix new file mode 100644 index 00000000000..f91b8191eb1 --- /dev/null +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-check"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "okken"; + repo = "pytest-check"; + rev = version; + sha256 = "11wb4f4sp4cr5mzqdakrbycwgfr2p1sx1l91fa6525wnfvgc0qy3"; + }; + + buildInputs = [ pytest ]; + + checkInputs = [ pytest pytestCheckHook ]; + + meta = with stdenv.lib; { + description = "pytest plugin allowing multiple failures per test"; + homepage = https://github.com/okken/pytest-check; + license = licenses.mit; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 93dd9fb654f..bf6d4cd2381 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,27 +1,25 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, six +{ stdenv, buildPythonPackage, fetchFromGitHub +, aiohttp , eventlet -, mock , iana-etc , libredirect -, aiohttp -, websockets -, websocket_client +, mock , requests +, six , tornado +, websocket_client +, websockets }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.4.3"; + version = "3.9.3"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf"; + sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y"; }; propagatedBuildInputs = [ @@ -29,13 +27,13 @@ buildPythonPackage rec { ]; checkInputs = [ + aiohttp eventlet mock - aiohttp - websockets - websocket_client - tornado requests + tornado + websocket_client + websockets ]; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 6b25ba93ef9..76508d1ec96 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server -, pytest, mock, pytestcov, coverage +, pytest, mock, pytestcov, coverage, setuptools , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -44,7 +44,7 @@ buildPythonPackage rec { HOME=$TEMPDIR pytest ''; - propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ] + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 ++ stdenv.lib.optional (withProvider "mccabe") mccabe ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index dcab96d12a6..40273cce888 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -32,4 +32,7 @@ buildPythonPackage rec { and not test_on_recv_wake \ and not test_monitor" ''; + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; } diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index b1c074faa8f..92977331a84 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.3"; + version = "0.20.4"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; + sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; }; buildInputs = [ pillow gfortran glibcLocales ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 503b899ec22..c3cc1baaf43 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }: +{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi, django, flask, tornado, sanic, aiohttp, bottle, rq, falcon, pyramid, celery }: buildPythonPackage rec { pname = "sentry-sdk"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965"; }; + checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ]; + propagatedBuildInputs = [ urllib3 certifi ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index e2ba008d3a0..601e49759fd 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { pytest ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = https://github.com/python-trio/trustme; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index f540cf72877..0514be0fb4d 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,12 @@ -{ buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.3.5"; - src = fetchPypi{ - inherit pname version; - sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak"; + version = "1.4.0"; + src = fetchFromGitHub{ + owner = "python"; + repo = "typed_ast"; + rev = version; + sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 1bf0d1c54f0..9f7efef1e84 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , click , h11 , httptools , uvloop , websockets , wsproto +, pytest +, requests , isPy27 }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.8.4"; + version = "0.9.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8"; }; propagatedBuildInputs = [ @@ -29,11 +33,15 @@ buildPythonPackage rec { wsproto ]; - checkPhase = '' - $out/bin/uvicorn --help + postPatch = '' + substituteInPlace setup.py \ + --replace "h11==0.8.*" "h11" ''; - patches = [ ./setup.patch ]; + checkInputs = [ pytest requests ]; + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://www.uvicorn.org/; diff --git a/pkgs/development/python-modules/uvicorn/setup.patch b/pkgs/development/python-modules/uvicorn/setup.patch deleted file mode 100644 index f1d974b42d9..00000000000 --- a/pkgs/development/python-modules/uvicorn/setup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 802cda4..561abf4 100755 ---- a/setup.py -+++ b/setup.py -@@ -42,7 +42,7 @@ env_marker = ( - - requirements = [ - "click==7.*", -- "h11==0.8.*", -+ "h11", - "websockets==7.*", - "httptools==0.0.13 ;" + env_marker, - "uvloop==0.12.* ;" + env_marker, diff --git a/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/pkgs/development/python-modules/uvloop/darwin_sandbox.patch new file mode 100644 index 00000000000..bd4e5e48b14 --- /dev/null +++ b/pkgs/development/python-modules/uvloop/darwin_sandbox.patch @@ -0,0 +1,28 @@ +diff --git a/tests/test_pipes.py b/tests/test_pipes.py +index d883abf..2e74d7a 100644 +--- a/tests/test_pipes.py ++++ b/tests/test_pipes.py +@@ -2,6 +2,7 @@ import asyncio + import io + import os + import socket ++import unittest + + from uvloop import _testbase as tb + +@@ -96,6 +97,7 @@ class _BasePipeTest: + # extra info is available + self.assertIsNotNone(proto.transport.get_extra_info('pipe')) + ++ @unittest.skip("darwin sandbox") + def test_read_pty_output(self): + proto = MyReadPipeProto(loop=self.loop) + +@@ -198,6 +200,7 @@ class _BasePipeTest: + self.loop.run_until_complete(proto.done) + self.assertEqual('CLOSED', proto.state) + ++ @unittest.skip("darwin sandbox") + def test_write_pty(self): + master, slave = os.openpty() + os.set_blocking(master, False) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 2093f4d7053..171f6d6ed32 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l"; }; + patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; @@ -31,6 +33,9 @@ buildPythonPackage rec { checkInputs = [ pyopenssl psutil ]; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Fast implementation of asyncio event loop on top of libuv"; homepage = http://github.com/MagicStack/uvloop; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 2e0caae4b46..589a8089fca 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,24 +1,26 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , pythonOlder +, pytest }: buildPythonPackage rec { pname = "websockets"; - version = "7.0"; + version = "8.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8"; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = pname; + rev = version; + sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8"; }; disabled = pythonOlder "3.3"; - doCheck = false; # protocol tests fail - meta = { + meta = with lib; { description = "WebSocket implementation in Python 3"; - homepage = https://github.com/aaugustin/websockets; - license = lib.licenses.bsd3; + homepage = "https://github.com/aaugustin/websockets"; + license = licenses.bsd3; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1616eacffc6..a9bb3487813 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -441,13 +441,17 @@ let nlme = [ pkgs.libiconv ]; Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; + minqa = [ pkgs.libiconv ]; igraph = [ pkgs.libiconv ]; ape = [ pkgs.libiconv ]; expm = [ pkgs.libiconv ]; mnormt = [ pkgs.libiconv ]; + pan = [ pkgs.libiconv ]; phangorn = [ pkgs.libiconv ]; quadprog = [ pkgs.libiconv ]; + randomForest = [ pkgs.libiconv ]; sundialr = [ pkgs.libiconv ]; + ucminf = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index ff630242c93..d44a6666ee9 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,30 +1,27 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre, gnused +{ stdenv, fetchurl, jre , disableRemoteLogging ? true }: with stdenv.lib; + +let +common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; version = "1.7.1"; - scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; + inherit sha256; }; - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper gnused ] ; - phases = "installPhase"; installPhase = '' - mkdir -p $out/bin - cp ${src} $out/bin/amm - chmod +x $out/bin/amm - ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm + install -Dm755 ${src} $out/bin/amm + sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' - ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm + sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm ''; meta = { @@ -36,8 +33,12 @@ stdenv.mkDerivation rec { that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. ''; homepage = http://www.lihaoyi.com/Ammonite/; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.nequissimus ]; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.nequissimus ]; }; +}; +in { + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; }; + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; }; } diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix new file mode 100644 index 00000000000..5fd6b402e0b --- /dev/null +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bingrep"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "m4b"; + repo = pname; + # Currently doesn't tag versions so we're using the raw revision + rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af"; + sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs"; + }; + + cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7"; + + meta = with stdenv.lib; { + description = "Greps through binaries from various OSs and architectures, and colors them"; + homepage = "https://github.com/m4b/bingrep"; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index f4c7047e8de..2d7d99bb393 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.107.0"; + version = "0.108.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b"; + sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cd8ae42f20b..41949b0ad42 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "22646"; - gittap = "3.8.0"; - gittip = "b4860e4eecad2053202965926f16296864b2f1e5"; - rev = "3.8.0"; - version = "3.8.0"; - sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd"; + version_commit = "22775"; + gittap = "3.9.0"; + gittip = "2afe613741d07f35a5d80bc4e2dade2113ae6a74"; + rev = "3.9.0"; + version = "3.9.0"; + sha256 = "0jzz3fzcr9xm8q6n86mhrf30h6cbh147ss9h993cm34fd4d5z7ah"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "22265"; + version_commit = "22775"; gittap = "3.6.0"; gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 8c47a8bc069..39e9830dd5d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a"; + sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy"; }; - modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh"; + modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index b606e547036..fc5f98a8ccb 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "0.28.0"; - rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; + version = "0.29.0"; + rev = "5bcc31df55ec1de770cb52887f2e989e7068301f"; goPackagePath = "github.com/bazelbuild/buildtools"; src = fetchgit { inherit rev; url = "https://github.com/bazelbuild/buildtools"; - sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0"; + sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index 5bae5b40653..4aaa37aa9a7 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -5,17 +5,17 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b"; + sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r"; }; } { - goPackagePath = "github.com/google/skylark"; + goPackagePath = "go.starlark.net"; fetch = { type = "git"; - url = "https://github.com/google/skylark"; - rev = "a5f7082aabed29c0e429c722292c66ec8ecf9591"; - sha256 = "16vsa6ngsby27n6indj441r1glcdfgipjcwcb0rs6zl2dqlqr286"; + url = "https://github.com/google/starlark-go"; + rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767"; + sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8"; }; } ] diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index d25367c3e57..f08a2e56342 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -17,10 +17,10 @@ in stdenv.mkDerivation rec { pname = "redo-apenwarr"; version = "0.42"; - src = fetchFromGitHub { + src = fetchFromGitHub rec { owner = "apenwarr"; - repo = pname; - rev = "${pname}-${version}"; + repo = "redo"; + rev = "${repo}-${version}"; sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm"; }; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 8ec2552aeff..71050356069 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { pname = "cask"; - version = "0.8.4"; - src = fetchurl { - url = "https://github.com/cask/cask/archive/v${version}.tar.gz"; - sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478"; - }; + inherit (emacsPackages.melpaStablePackages.cask) src version; doCheck = true; + + nativeBuildInputs = [ emacsPackages.emacs ]; buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build + ] ++ [ + python ]; + buildPhase = '' emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el ''; @@ -38,11 +39,9 @@ stdenv.mkDerivation rec { Cask can also be used to manage dependencies for your local Emacs configuration. ''; - homepage = https://cask.readthedocs.io/en/latest/index.html; + homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.flexw ]; }; - - nativeBuildInputs = [ emacsPackages.emacs python ]; } diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 7a3d7882715..b8026a9f885 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoPackage rec { pname = "golangci-lint"; version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; @@ -14,8 +14,6 @@ buildGoModule rec { sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac"; }; - modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6"; - meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 45b6a14eb08..28bd27ecc76 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -51,7 +51,7 @@ GEM gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.11.0) + jazzy (0.11.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -69,9 +69,9 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.10.0) + rouge (3.11.0) ruby-macho (1.4.0) - sassc (2.2.0) + sassc (2.2.1) ffi (~> 1.9) sqlite3 (1.4.1) thread_safe (0.3.6) diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index dada7f43073..19ec06b6a2b 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -209,10 +209,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm"; + sha256 = "0kdja4bhzak79xvfpwwakqsjw07vfg458d62k08a416im7xcfcmc"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; liferaft = { source = { @@ -301,10 +301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz"; + sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; type = "gem"; }; - version = "3.10.0"; + version = "3.11.0"; }; ruby-macho = { groups = ["default"]; @@ -322,10 +322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf"; + sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; sqlite3 = { groups = ["default"]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix new file mode 100644 index 00000000000..102f911bf85 --- /dev/null +++ b/pkgs/development/tools/micronaut/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, jdk, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "micronaut"; + version = "1.2.1"; + + src = fetchzip { + url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; + sha256 = "0lfl2hfakpdcfii3a3jr6kws731jamy4fb3dmlnj5ydk0zbnmk6r"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/mn.bat + cp -r . $out + wrapProgram $out/bin/mn \ + --prefix JAVA_HOME : ${jdk} + ''; + + meta = with stdenv.lib; { + description = '' + A modern, JVM-based, full-stack framework for building modular, + easily testable microservice and serverless applications. + ''; + longDescription = '' + Reflection-based IoC frameworks load and cache reflection data for + every single field, method, and constructor in your code, whereas with + Micronaut, your application startup time and memory consumption are + not bound to the size of your codebase. + ''; + homepage = https://micronaut.io/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index e1b89d07cdf..a590d4a6106 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoModule }: -let - owner = "CircleCI-Public"; +buildGoModule rec { pname = "circleci-cli"; - version = "0.1.2569"; -in -buildGoPackage { - name = "${pname}-${version}"; - inherit version; + version = "0.1.5879"; - src = fetchFromGitHub { - inherit owner; + src = fetchFromGitHub { + owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x"; + sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac"; }; - goPackagePath = "github.com/${owner}/${pname}"; + modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268"; + + preBuild = '' + substituteInPlace data/data.go \ + --replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")' + ''; + + postInstall = '' + install -Dm644 -t $out/share/circleci-cli _data/data.yml + ''; meta = with stdenv.lib; { # Box blurb edited from the AUR package circleci-cli @@ -25,7 +29,6 @@ buildGoPackage { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; - platforms = platforms.unix; license = licenses.mit; homepage = https://circleci.com/; }; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 869e7a61121..08f8049aa8a 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -27,10 +27,10 @@ with pkgs.stdenv.lib; # don't scan version control directories defaultArgs = [ - "--exclude=\.svn" - "--exclude=\.hg" - "--exclude=\.git" - "--exclude=\_darcs" + "--exclude=.svn" + "--exclude=.hg" + "--exclude=.git" + "--exclude=_darcs" "--sort=yes" ]; @@ -38,8 +38,8 @@ with pkgs.stdenv.lib; asLang = [ "--langdef=ActionScript" "--langmap=ActionScript:.as" - "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" - "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/" + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" @@ -67,7 +67,7 @@ with pkgs.stdenv.lib; nixLang = [ "--langdef=NIX" "--langmap=NIX:.nix" - "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" + "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" ]; rubyLang = [ diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index cb127906c0b..b1a51a77144 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "elfinfo"; version = "0.7.6"; @@ -12,8 +12,6 @@ buildGoModule rec { sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9"; }; - modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf"; - meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; homepage = https://elfinfo.roboticoverlords.org/; diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix new file mode 100644 index 00000000000..24ca98118bd --- /dev/null +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "hydra-cli"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nlewo"; + repo = pname; + rev = "v${version}"; + sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc"; + }; + + cargoSha256 = "0dqj2pdqfbgg8r3h2s07p3m9zgl9xl4vislbqs6a0f1ahrczlda5"; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + nativeBuildInputs = [ + pkgconfig + openssl + ]; + + meta = with stdenv.lib; { + description = "A client for the Hydra CI"; + homepage = "https://github.com/nlewo/hydra-cli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gilligan lewo ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 7a3ccaa9fbc..b9b1f83322d 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "mkcert"; version = "1.4.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7"; }; - modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd"; + goPackagePath = "github.com/FiloSottile/mkcert"; meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 573575f2d4f..94492395a58 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-lsp"; - version = "0.0.5"; + version = "0.0.9"; src = fetchFromGitHub { owner = "juliosueiras"; repo = pname; rev = "v${version}"; - sha256 = "018ypvmd9cwys5l7rm1c7b9jf8fljdk0m22id32d88jiw4iwq44m"; + sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk"; }; - modSha256 = "1196fn69nnplj7sz5mffawf58j9n7h211shv795gknvfnwavh344"; + modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2"; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 12f0b13a660..eac81aa7f17 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,18 +1,19 @@ { stdenv, lib, fetchgit, cmake, llvmPackages, boost, python , gocode ? null , godef ? null +, gotools ? null , rustracerd ? null , fixDarwinDylibNames, Cocoa ? null }: stdenv.mkDerivation { pname = "ycmd"; - version = "2018-09-20"; + version = "2019-09-19"; src = fetchgit { url = "https://github.com/Valloric/ycmd.git"; - rev = "bf658fd78722c517674c0aaf2381e199bca8f163"; - sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl"; + rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702"; + sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd"; }; nativeBuildInputs = [ cmake ]; @@ -49,18 +50,28 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd - mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} - - for p in jedi waitress frozendict bottle parso python-future requests; do - cp -r third_party/$p $out/lib/ycmd/third_party - done + # Copy everything: the structure of third_party has been known to change. + # When linking our own libraries below, do so with '-f' + # to clobber anything we may have copied here. + mkdir -p $out/lib/ycmd/third_party + cp -r third_party/* $out/lib/ycmd/third_party/ '' + lib.optionalString (gocode != null) '' - ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode + TARGET=$out/lib/ycmd/third_party/gocode + mkdir -p $TARGET + ln -sf ${gocode}/bin/gocode $TARGET '' + lib.optionalString (godef != null) '' - ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef + TARGET=$out/lib/ycmd/third_party/godef + mkdir -p $TARGET + ln -sf ${godef}/bin/godef $TARGET + '' + lib.optionalString (gotools != null) '' + TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls + mkdir -p $TARGET + ln -sf ${gotools}/bin/gopls $TARGET '' + lib.optionalString (rustracerd != null) '' - ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release + TARGET=$out/lib/ycmd/third_party/racerd/target/release + mkdir -p $TARGET + ln -sf ${rustracerd}/bin/racerd $TARGET ''; # fixup the argv[0] and replace __file__ with the corresponding path so diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 19432843218..4dd21671325 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.08"; + name = "camlp5-7.10"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz"; - sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76"; + url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz"; + sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 694f4b6e89a..4eb1cc858ad 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.8"; + version = "0.11.0"; - minimumOCamlVersion = "4.05"; + minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j"; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; }; buildInputs = [ - base cmdliner fpath ocaml-migrate-parsetree + odoc + re stdio + uuseg + uutf ]; - configurePhase = '' - patchShebangs tools/gen_version.sh - tools/gen_version.sh src/Version.ml version - ''; - meta = { inherit (src.meta) homepage; description = "Auto-formatter for OCaml code"; - maintainers = [ stdenv.lib.maintainers.Zimmi48 ]; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.Zimmi48 ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 5d8376acdb3..dfdd453cb4e 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2"; + sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index c8f7ccb18d5..7e592bf060a 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper +{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 , withDocumentation ? false }: -with stdenv.lib; +with lib; let baseVersion = "4.9"; @@ -21,7 +21,7 @@ let }); in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtcreator"; version = "${baseVersion}.${revision}"; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index ec2325fc625..79b1214de65 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-inspect"; @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5"; meta = with lib; { diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e7b21c40f17..e36f34bb10c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.37"; + version = "0.1.39"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62"; + sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 5743868d5d9..939b065a55c 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.16.0"; - sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq"; + version = "10.16.3"; + sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv"; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index b3764ea1efc..bac7bd345f9 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,54 +1,69 @@ -{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut -, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer -, zlib, libpng, libGLU_combined, physfs +{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +, lib, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, zlib, libpng, libGL, libGLU, physfs +, qtbase, qttools +, withServer ? true }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring random hslogger - SHA entropy pkgs.zlib sandi regex-tdfa + SHA bytestring entropy hslogger network pkgs.zlib random + regex-tdfa sandi utf8-string vector ]); + in -stdenv.mkDerivation { - version = "1.0.0-beta1"; +mkDerivation rec { pname = "hedgewars"; + version = "1.0.0-beta2"; + + # it's crazy slow to fetch the whole repo but the beta versions are not + # released as tarballs src = fetchhg { url = "https://hg.hedgewars.org/hedgewars/"; - rev = "7ab5cf405686"; - sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4"; + rev = "dff37ac61dcf"; + sha256 = "1dsq6wfv3d7jfnr068b7ixpnqp0h6mj7zgby6h1viwblgbirri78"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; + buildInputs = [ - SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc - ghc ffmpeg freeglut makeWrapper physfs - qt5.qttools qt5.qtbase - ]; + SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image + fpc lua5_1 + ffmpeg freeglut physfs + qtbase + ] ++ lib.optional withServer ghc; postPatch = '' - substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate + substituteInPlace gameServer/CMakeLists.txt \ + --replace mask evaluate ''; - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL2_image}/lib - -rpath ${SDL2_mixer}/lib - -rpath ${SDL2_net}/lib - -rpath ${SDL2_ttf}/lib - -rpath ${SDL2.out}/lib - -rpath ${libpng.out}/lib - -rpath ${lua5_1}/lib - -rpath ${libGLU_combined}/lib - -rpath ${zlib.out}/lib - " - ''; + cmakeFlags = [ + "-DNOVERSIONINFOUPDATE=ON" + "-DNOSERVER=${if withServer then "OFF" else "ON"}" + ]; - postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ libGLU_combined freeglut physfs ]} - ''; + NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ + SDL2.out + SDL2_image + SDL2_mixer + SDL2_net + SDL2_ttf + libGL + libGLU + libpng.out + lua5_1 + physfs + zlib.out + ]; + + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}" + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; - homepage = http://hedgewars.org/; + homepage = "http://hedgewars.org/"; license = licenses.gpl2; longDescription = '' Each player controls a team of several hedgehogs. During the course of @@ -74,7 +89,7 @@ stdenv.mkDerivation { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) platforms; hydraPlatforms = []; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 32830d6f3d0..7abd6c162e0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,51 +1,137 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper -, jdk, jre, libpulseaudio, libXxf86vm +{ stdenv +, fetchurl +, makeDesktopItem +, makeWrapper +, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) +, xorg +, zlib +, nss +, nspr +, fontconfig +, gnome2 +, cairo +, expat +, alsaLib +, cups +, dbus +, atk +, gtk2-x11 +, gdk-pixbuf +, glib +, curl +, freetype +, libpulseaudio +, systemd +, flite ? null +, libXxf86vm ? null }: let desktopItem = makeDesktopItem { - name = "minecraft"; - exec = "minecraft"; - icon = "minecraft"; - comment = "A sandbox-building game"; - desktopName = "Minecraft"; - genericName = "minecraft"; - categories = "Game;"; + name = "minecraft-launcher"; + exec = "minecraft-launcher"; + icon = "minecraft-launcher"; + comment = "Official launcher for Minecraft, a sandbox-building game"; + desktopName = "Minecraft Launcher"; + categories = "Game;Application;"; }; - libPath = stdenv.lib.makeLibraryPath [ - libpulseaudio - libXxf86vm # Needed only for versions <1.13 - ]; + envLibPath = stdenv.lib.makeLibraryPath [ + curl + libpulseaudio + systemd + alsaLib # needed for narrator + flite # needed for narrator + libXxf86vm # needed only for versions <1.13 + ]; -in stdenv.mkDerivation { - name = "minecraft-2015-07-24"; + libPath = stdenv.lib.makeLibraryPath ([ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gnome2.GConf + gnome2.pango + gtk2-x11 + nspr + nss + stdenv.cc.cc + zlib + ] ++ + (with xorg; [ + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libXScrnSaver + ])); +in + stdenv.mkDerivation rec { + pname = "minecraft-launcher"; + + version = "2.1.5965"; src = fetchurl { - url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; - sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8"; + url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; + sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845"; + }; + + icon = fetchurl { + url = "https://launcher.mojang.com/download/minecraft-launcher.svg"; + sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/share/minecraft + mkdir -p $out/opt + mv minecraft-launcher $out/opt - makeWrapper ${jre}/bin/java $out/bin/minecraft \ - --add-flags "-jar $out/share/minecraft/minecraft.jar" \ - --suffix LD_LIBRARY_PATH : ${libPath} + ${desktopItem.buildCommand} + install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg - cp $src $out/share/minecraft/minecraft.jar - cp -r ${desktopItem}/share/applications $out/share - install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png + makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ + --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} + ''; + + preFixup = '' + patchelf \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/minecraft-launcher + patchelf \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/libcef.so + patchelf \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/liblauncher.so ''; meta = with stdenv.lib; { - description = "A sandbox-building game"; - homepage = https://minecraft.net; + description = "Official launcher for Minecraft, a sandbox-building game"; + homepage = "https://minecraft.net"; maintainers = with maintainers; [ cpages ryantm infinisil ]; - license = licenses.unfreeRedistributable; + license = licenses.unfree; }; + + passthru.updateScript = ./update.sh; } diff --git a/pkgs/games/minecraft/update.sh b/pkgs/games/minecraft/update.sh new file mode 100755 index 00000000000..02b362e839b --- /dev/null +++ b/pkgs/games/minecraft/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts + +set -eu -o pipefail + +version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)') +update-source-version minecraft "$version" diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e3c23ad2671..d0828b8811b 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; + sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 948e5ed72ab..bf0f4ef8279 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "4"; + version = "5"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; rev = "v${version}"; - sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5"; + sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy"; }; nativeBuildInputs = [ cmake ]; @@ -25,13 +25,29 @@ stdenv.mkDerivation rec { This driver is known to work with these printers: Brother DCP-1510 + Brother DCP-1602 Brother DCP-7030 Brother DCP-7040 Brother DCP-7055 Brother DCP-7055W + Brother DCP-7060D Brother DCP-7065DN - Brother HL-L2300D + Brother DCP-7080 + Brother DCP-L2500D + Brother DCP-L2540DW + Brother HL-1110 series + Brother HL-1200 series + Brother HL-L2300D series + Brother HL-L2320D series + Brother HL-L2340D series + Brother HL-L2360D series + Brother MFC-1910W + Brother MFC-7240 Brother MFC-7360N + Brother MFC-7365DN + Brother MFC-7840W + Brother MFC-L2710DW + Lenovo M7605D ''; homepage = https://github.com/pdewacht/brlaser; license = licenses.gpl2; diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 13e3013267b..364a7336bf3 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "5.30"; + version = "5.70"; src = fetchzip { - url = "http://gdlp01.c-wss.com/gds/9/0100007129/01/cnijfilter2-source-5.30-1.tar.gz"; - sha256 = "0gnl9arwmkblljsczspcgggx85a19vcmhmbjfyv1bq236yqixv5c"; + url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz"; + sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is"; }; buildInputs = [ diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 023e48fc991..7b26bf44cdc 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.14"; + version = "4.16"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs"; + sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j"; + sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20190615"; - sha256 = "1bdvj363yjn7agqq1fxdfz31j1rrs2wc02v874jjx5sw1bfq5qsa"; + version = "20190912"; + sha256 = "08my9crgpj5ai77bm64v99x4kmdb9dl8fw14581n69id449v7gzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix index 04929a4cb4d..7c1eb54f92f 100644 --- a/pkgs/misc/themes/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/clearlooks-phenix/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, the default theme for Gnome 2. Style is also included for GTK2, Unity and for Metacity, Openbox and Xfwm4 window managers. - - You should install this theme into your user profile and then set - GTK_DATA_PREFIX to `~/.nix-profile`. ''; homepage = https://github.com/jpfleury/clearlooks-phenix; downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c82e7dcf8d4..138feea39e1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-09-12"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "61cfb3fefb0ebd8654be452046bd2ba24025311f"; - sha256 = "11i5jr5zgvkl7wr99jjldyypbd5xsnyj8q9j379gl2xk5brjwbaf"; + rev = "ab8e0433536dc6074c77f6ed1fa18325ea1be349"; + sha256 = "0nlpcph9f0sfx50rvzdc2vz6b23x2hgx46ywjflfix54cmakpkl8"; }; }; @@ -83,12 +83,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2019-01-30"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "dec377ddffd6616aa156029a5f065496582f697b"; - sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm"; + rev = "95531d40e5c5a6417aac53b7d4e8bd7130d5efe6"; + sha256 = "1xa8hh95am0baxrjm411fdpzmf3mkkfcpb56cxr81n9idmq1qlqp"; }; }; @@ -138,12 +138,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-08-29"; + version = "2019-09-21"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18"; - sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z"; + rev = "21f5c63f22fe70b0fae3ff0fb9e55c602e622ea7"; + sha256 = "1k7h8faz9qqyqzpkxxhsjsdqyah6amwk3rlhxygz9qg25mp558xf"; }; }; @@ -303,34 +303,34 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-09-10"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "c463de323cb7f162747e545bff694d6293a9be60"; - sha256 = "15r8gwsk69gg1p68jgi3gw0m29lbfs7iddcmhgr5qkrvk8rhhi1j"; + rev = "672beb8976e0a8fe0e5c52dc00263144077b659d"; + sha256 = "0g6cwcbirkqqnljyhlpfdx2q09b5irrp39bqlgl9qb912sz90fqg"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-09-13"; + version = "2019-09-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "059f6ecae0849024d299d9e744622d439c73ddca"; - sha256 = "0n9ffsk9qds5ap3049kw05v167ialhmix28mwygdxgzjvr9qpd4q"; + rev = "3c7954c3e167ca3785efb96d3e95563b7e0d4045"; + sha256 = "0nir8yvqrz2a8zmjp8ny4s08qlcvy3ms6k55i21xvyjwyrmrknpq"; }; }; coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; - version = "2019-08-03"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-highlight"; - rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa"; - sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp"; + rev = "775dd5e0a2c8f6e3834e002ca855a305ca267422"; + sha256 = "0dmzpfvxj8kw6knnsbfjzx1d3n9i5rff9nw7j9pl1brmgk2r5r77"; }; }; @@ -358,12 +358,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-07-17"; + version = "2019-09-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "50343bf5e965e311444aade22599f9d247902852"; - sha256 = "08crsdw2cgn30j6mbkm74zsgi92khb1xdkx53gk1r33qcgbzi47y"; + rev = "7e3bdee15b28f5d7f3b1654429c89cb0d93436e5"; + sha256 = "0r17w00mbs1gshshm8c56cqi37z5i5vdk2sifs2clazlyn9rl6zm"; }; }; @@ -424,12 +424,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-09-10"; + version = "2019-09-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "b78dcb1000841a428d23d457ac93c190b98f7b35"; - sha256 = "0krc9dnzglh8rff68xyp27qjdgmqhxvl94jy1x4asl5a5srzz7v7"; + rev = "5b25fc3a4709c1e0e61f95ec82f039d1b8c426a3"; + sha256 = "1j4whxna3gjjs29ndlfr9wpzylapa889831yf1pn7lz2847hnjdr"; }; }; @@ -766,12 +766,23 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-05-04"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "8ffc3e208c282f19afa237d343fa1533146bd2b4"; - sha256 = "1ypcn3212d7gzfgvarrsma0pvaial692f3m2c0blyr1q83al1pm8"; + rev = "27b3ebd24f1c5690700b7f94f112c06216a0dd76"; + sha256 = "012vg71h0jijhj430dqd38xh2gq5k79zr1m59gvh004jjb8bh8c7"; + }; + }; + + defx-nvim = buildVimPluginFrom2Nix { + pname = "defx-nvim"; + version = "2019-08-19"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "defx.nvim"; + rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5"; + sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8"; }; }; @@ -810,12 +821,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-09-08"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "dedeed5cb3fab46465a1f30efa4875c4937ed2f7"; - sha256 = "1c65mhc4dw0zf1azqfnjf7l5gp2pxayq8qv0j1lvlqpn6q6gg1di"; + rev = "a4969dfe9decc6184548b919379ec39027d627c6"; + sha256 = "0crwjbvflvf5axgqqfj04q67ilgfnhchi0gxbxi152h6hm4f1wx3"; }; }; @@ -901,12 +912,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-09-11"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "28b15222852a0668b25ce04b66302275ea8cd4c5"; - sha256 = "05n1smyjlzzq428h5hfs0drifxwjbshc9csv8jx7yjwpm4gqy2md"; + rev = "335e8a03d5741aa42bd7ce64d79e31d7de570ab5"; + sha256 = "0jn4fn9vkxf3av6mdmzixz20l9ca8n2sql7j9mcmh06mn86949bs"; }; }; @@ -934,12 +945,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-09-14"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "8df5ca1a9db11d919f3426f4d05b281be8913c89"; - sha256 = "0c0g9h8fajmwb2snkqj093jwc8d1ypxcvmv7s80c90l635bks1yj"; + rev = "7f1d4d8b1f5dbf344f2d0d1f4b8c5d6a0aaa24a6"; + sha256 = "1i8964nwarq2hwbixbj74n5a5k8c27hn7srbf8bbckk12rh1rjkj"; }; }; @@ -1046,12 +1057,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-09-12"; + version = "2019-09-17"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "3ba858de194fc53b301fb640ab71b4263bc66175"; - sha256 = "1vbzlq7k2l0yqhdcnldkliwyzqskf1bqjgxl2l4c0nj8rcjm5bw3"; + rev = "a6ba8a5d6745d92a23eb8b95562bbd9f05f8de5f"; + sha256 = "0in4fs2aycwyspi1yck36f6w6m9jmjm5ckdq5wxisvjncnzxblhs"; }; }; @@ -1111,6 +1122,17 @@ let }; }; + float-preview-nvim = buildVimPluginFrom2Nix { + pname = "float-preview-nvim"; + version = "2019-04-07"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "float-preview.nvim"; + rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3"; + sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd"; + }; + }; + floobits-neovim = buildVimPluginFrom2Nix { pname = "floobits-neovim"; version = "2018-08-01"; @@ -1388,12 +1410,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-08-18"; + version = "2019-09-18"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe"; - sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y"; + rev = "89c995e7d964fb71c715e6f4ac330e4c59b44128"; + sha256 = "02ks1bwrdw7zmnf9mipvfjla9cv6904sx18q9qnyrqbkclrpfn0y"; fetchSubmodules = true; }; }; @@ -1730,12 +1752,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-09-03"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "776a6f6e27330e38324b7ad4873329760adf72e3"; - sha256 = "0lxqqknp1xmaa8ys5ck5m9pyxv0hbpaba1bsv6fx6j6jb71nz590"; + rev = "ba38b8786ce68c36fc3cd2139a7820b25bea378a"; + sha256 = "187zj4ircbbhn7gp3gabzrcnld3mz5g76ibp4wbcxngml60hhk9r"; }; }; @@ -1785,12 +1807,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-09-12"; + version = "2019-09-21"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "511f6c64ca2530f4356e0b301ee0f34b956ac7aa"; - sha256 = "1645q70jg81jy7gxdd8kr7i5pgkr2k7i71ijk4k23lxj0yd4fsim"; + rev = "f6c22fda80455b52957b3fd11d94acc44db21250"; + sha256 = "1r1fx958qhbs8xq31wrp5jyfvqjrs611xywv7avpwy9991rh33xv"; }; }; @@ -1818,23 +1840,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-09-13"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "8228c7b0a7aa46b7846f7bf21bcb89ce24b9c20e"; - sha256 = "098alydvc9calcxkv77c8wkxw41p2az2dk70bx279ngz648i150c"; + rev = "50f307bbf68e7402a1564689910ec65ae7ab1781"; + sha256 = "0f3b9vx3lvq8612k1qnsdzbwp2drvy1vj3xqfxvxpzzsay10qcb1"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-09-13"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "60ec10b477eefc81eeafafa2a8c1b00046ee48fb"; - sha256 = "1l9lz56cdkifp4arf05z298jg0yfvr2wvfbnzaff62yc38n4hb4b"; + rev = "9193962ad88f15d9f426c3cfb8a274ff1dd0c5b2"; + sha256 = "1mgi6k3q46za4c8z9nc4rn6pcj4bc9pkvfqbzymwn03pj4r6n8yp"; }; }; @@ -2005,12 +2027,12 @@ let psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; - version = "2018-03-11"; + version = "2019-09-17"; src = fetchFromGitHub { owner = "frigoeu"; repo = "psc-ide-vim"; - rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; - sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; + rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465"; + sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f"; }; }; @@ -2181,12 +2203,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-30"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f"; - sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy"; + rev = "d0456774a8a9616fea9df66e5131d6428450ebed"; + sha256 = "1zbd7gbiyx1lmr8kg70xwad88rrs18q7rgy7yv85l57zs71ffnib"; }; }; @@ -2203,12 +2225,12 @@ let semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-09-12"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "741916c472adc40f82d191ec48e668e88251e626"; - sha256 = "0ld4fk8a8k2mf8q32zjq3lbb8nhdg214n5kp221z0vw2a72zgkjn"; + rev = "ca6b2c16dd374d672861b2c73c33f41c88e5cb39"; + sha256 = "0nmywnfs8rm6vlcyycnk1zvpp044n1d714xw5sn4qpw4gz1acbm7"; }; }; @@ -2234,6 +2256,17 @@ let }; }; + ShowMultiBase = buildVimPluginFrom2Nix { + pname = "ShowMultiBase"; + version = "2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "ShowMultiBase"; + rev = "85a39fd12668ce973d3d9282263912b2b8f0d338"; + sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i"; + }; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -2852,12 +2885,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-07-23"; + version = "2019-09-18"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "b85165844240fe0b9121df487679a320e053abc7"; - sha256 = "0yi381n7k3flcld66n8hhb3fzbqflif5d07qwn8f6zsg9n52dciw"; + rev = "0d5c5c1e2995126e76606a628316c8e3f5efb37a"; + sha256 = "1xra1yiz03pap18hsq00053s42xf185ls9qydrkgpyjypqdnm5bg"; }; }; @@ -2973,12 +3006,12 @@ let vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; - version = "2019-08-21"; + version = "2019-09-17"; src = fetchFromGitHub { owner = "t9md"; repo = "vim-choosewin"; - rev = "6da5c0b96e63f51f0801266b781dee0562e74da9"; - sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5"; + rev = "f91cdb9be92ce3bb9bccba16e8c659d5e8d7454f"; + sha256 = "1nq1vpwv6h5sc849y26nzkrmr9w3aj6w32apyih9kx0jh4ybv0xs"; }; }; @@ -3127,12 +3160,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-09-14"; + version = "2019-09-17"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "3e67b21c6e6f955ee5051608c559c2e91c2ce3e5"; - sha256 = "0105s1d1pn1ga2zpqi1lgjnx36plgfsniqx1b560dvmg8wglzpwx"; + rev = "0f9146e9fafe3317693ca214a3f68cd1e036424f"; + sha256 = "086ng0gja855bmh99qcwwvchwk64dgz1kj1j24yapx2ab314w6g8"; }; }; @@ -3160,12 +3193,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-08-07"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "a76bec9196fe27e195d167a5c2ee1da763d31b96"; - sha256 = "0a9sxpdpll68drk3w98xvmv2z31q4afw70iwjrb7lmp8raxn0i2z"; + rev = "1f39fa150fc9275ff264e1f8807fc6fcbbdae012"; + sha256 = "0c1492hh0gldjyd8w3wsyz6py7qw4r2idfjh8klkk39pg9aajwjl"; }; }; @@ -3358,12 +3391,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-09-11"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "26f6037de68254376cd062286aeeaa7db804a973"; - sha256 = "0cza5v99493llr02all1zwjy3gk19hypngk6j3kcrg7530c9sq6n"; + rev = "1d8c0a38b2fc4ce9ca4204676573b6335725ff75"; + sha256 = "0ln11qdpsssgqd122zldfmjvwyvxild8a0yxgdazp720dypkvgjm"; }; }; @@ -3402,12 +3435,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-09-05"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "b71ab64dc16a4665c3214f109000a11d30708079"; - sha256 = "1pqd9zf311s0in5x3njzcxkw6zyqa2vpznl5ahd4b9hk4qvcm2v8"; + rev = "76aa5920dba9b05991940f7dc29dc79ad7af0a3e"; + sha256 = "0yazz5aqyfkwhx2x44pp8x81wswrh7sjgslbimwa9d67yvnh0bz6"; }; }; @@ -3435,12 +3468,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-09-13"; + version = "2019-09-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "041ca9669bbbe4a50b382d8972a7191edf873f55"; - sha256 = "1q3sca1gpxc7iqdk6wkdzndwpf8i8z69is4jwmnhr0sk0jrjby6q"; + rev = "6904ded741573113c20408abdce455c5d3969e08"; + sha256 = "12ill4rpfc3bzxa6s47mscvbclidnckxci3rdixzkvrmwsyyip6k"; }; }; @@ -3466,6 +3499,17 @@ let }; }; + vim-gui-position = buildVimPluginFrom2Nix { + pname = "vim-gui-position"; + version = "2019-06-06"; + src = fetchFromGitHub { + owner = "brennanfee"; + repo = "vim-gui-position"; + rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a"; + sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3"; + }; + }; + vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; version = "2019-05-06"; @@ -3688,12 +3732,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-02-07"; + version = "2019-09-16"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "29fee1cb4554eef3e5a30984ac7a389766ee4da4"; - sha256 = "1kzx80hz9n2bawrx9lgsfqmjkljbgc1lpl8abnhfzkyy9ax9svk3"; + rev = "24e7908bae33df5851f7085f5ec3af0ca81f060c"; + sha256 = "1bqrhkxk6f5ha7xlkgqrp96a1pfk9258x5b4iz3kbk2gqp6mcrmb"; }; }; @@ -3777,12 +3821,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-09-07"; + version = "2019-09-18"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "6871eb1696478a8e295bab3e5ae7aae05faa2605"; - sha256 = "0i80d5vdd5ycx0g0h00raa3g48xhgw3wf3blp1m3hwap6cxy9p8h"; + rev = "89c30c0defe8ddb31bc0d3cfa5f22f3f6d8eb24f"; + sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir"; }; }; @@ -4140,12 +4184,12 @@ let vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; - version = "2019-07-02"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "bhurlow"; repo = "vim-parinfer"; - rev = "217255335414b3046f683bd3085fbf16b00bb090"; - sha256 = "10jhcmkivspr15xmprdi484r8va7v8jqflx9xkxwficfjd52lvck"; + rev = "eba349553e2438dcc9d37f3a6aff2807af731c3f"; + sha256 = "07cppsywz60ss0af86z4ia9kbixnwf9bl437fxq7hwhx6wig0njq"; }; }; @@ -4250,12 +4294,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2019-04-23"; + version = "2019-09-16"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "b2ae19b3ef397ed7404bf15051cbc5ff655b893e"; - sha256 = "1hidg2cqls9qy0lazahxi26gyj4lwncpc3vzy4m9xjd3y1lmlqri"; + rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d"; + sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x"; }; }; @@ -4481,12 +4525,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-09-13"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "2221222df8cbc1a99c29f3e55a7c340f4d16b1ff"; - sha256 = "0vjgxxg7aq5j7lxc0pn0fral5gjb4fpc42442q8mkik6cpkd92h0"; + rev = "db67e54d5998dbfbe9fe4161a29d74323031b1fa"; + sha256 = "1d5mynnb90fnc1w0glfg2m953iphmhxndd5gmflg25720n3msdls"; }; }; @@ -4536,12 +4580,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-08-27"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "13b67af7aa6a454adbf1f0925bf41737889ed830"; - sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh"; + rev = "9814df57c199271a9b2b70c75ebe4189dc96b126"; + sha256 = "1rsss95six8f9w075k46318kq2sapijik13jzkakf5nfxlbi2raw"; }; }; @@ -4635,12 +4679,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-08-29"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233"; - sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p"; + rev = "81dd8ea296660a51618cefed62462ddff56f22fa"; + sha256 = "1im4klyfgz5ab98ygc0jw1h9gnylab8zvzm4pk2rga2zbz9ymkxj"; }; }; @@ -4954,12 +4998,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-09-13"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "365e3d27d922036d5770a2591a3670cc5a3db777"; - sha256 = "1rgafa05lfvyzznlq1y7cb3b3q3m2df5j82ggjwds7wfl4pm4zcz"; + rev = "ece9f454ac2f590629ebbbbe4b0bb23deafdcb04"; + sha256 = "05h1hya3c4k9z1x2k13k1a1zpq8lf7nr8ggg548mmayh0cv5qvqs"; }; }; @@ -5109,12 +5153,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-08-31"; + version = "2019-09-18"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "5274b73fc26deb5704733e0efbb4b2d53dc6dc9c"; - sha256 = "03kpq7mw4dimaahf9q6qm6nblzw7hr0p7i6m6x3b9ilkka5q13rz"; + rev = "bdbfdd938fe711ff75155546fc0a0e0bebcb952a"; + sha256 = "0dxip8xi6s74045hvbx6av16caid150lvywg2sn7kq5x6zcc9dgc"; fetchSubmodules = true; }; }; @@ -5143,23 +5187,23 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2019-09-13"; + version = "2019-09-20"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "13254888f5ebe53c3d9276c8afc18efe6addec8e"; - sha256 = "1xdi8q4cggv16bv71ap8y8xrmzb7pjvknrymrnab55fgbpkxhzaj"; + rev = "d39461f7ad13814307cc0115122b32901662a86e"; + sha256 = "1ww4irkl6h2q9p1y2gj87j4hy0rh2gkfz8nyzfn32z6rjsmj5n3c"; }; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-09-05"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "06e918ba082bbe41544208430d6946b547ce3530"; - sha256 = "1sfh1xmsf8smgr7vpj6r11gp3wmw5zzf095w2li9rw8l2g54cwql"; + rev = "29d9358a825c56a31f6438ea93eb09f091998f0d"; + sha256 = "1rah0fm3qxv3jjb0ma2pn5kvbg2fwg4p5ycgm6vjbq95j73f5aq1"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d5a1ed67665..4d127c20e31 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -49,16 +49,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.146"; + version = "0.1.154"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk"; + sha256 = "03sp643nihj9p2s9cx2dcazhz68s30qx7igqprgsmr1040rhg2py"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh"; + cargoSha256 = "1bvbls2l1xa0s3k11crvd98il4i20z5sn0hqmsc1b915k03qq4zj"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -166,6 +166,10 @@ self: super: { ''; }); + defx-nvim = super.defx-nvim.overrideAttrs(old: { + dependencies = with super; [ nvim-yarp ]; + }); + deoplete-fish = super.deoplete-fish.overrideAttrs(old: { dependencies = with super; [ deoplete-nvim vim-fish ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 67dd2db4a9f..107105d6b72 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ bitc/vim-hdevtools bkad/camelcasemotion bling/vim-bufferline bogado/file-line +brennanfee/vim-gui-position bronson/vim-trailing-whitespace brooth/far.vim carlitux/deoplete-ternjs @@ -238,6 +239,7 @@ nathanaelkane/vim-indent-guides nathangrigg/vim-beancount navicore/vissort.vim nbouscal/vim-stylish-haskell +ncm2/float-preview.nvim ncm2/ncm2 ncm2/ncm2-bufword ncm2/ncm2-jedi @@ -339,6 +341,7 @@ sebastianmarkow/deoplete-rust sheerun/vim-polyglot Shougo/context_filetype.vim Shougo/denite.nvim +Shougo/defx.nvim Shougo/deol.nvim Shougo/deoplete-lsp Shougo/deoplete.nvim @@ -443,6 +446,7 @@ vim-scripts/PreserveNoEOL vim-scripts/random.vim vim-scripts/Rename vim-scripts/ReplaceWithRegister +vim-scripts/ShowMultiBase vim-scripts/tabmerge vim-scripts/taglist.vim vim-scripts/wombat256.vim diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 03556296ca1..16454cbc1a5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -14,8 +14,8 @@ appleDerivation { # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" - "-DDEFAULT_AT_QUEUE=\'a\'" - "-DDEFAULT_BATCH_QUEUE=\'b\'" + "-DDEFAULT_AT_QUEUE='a'" + "-DDEFAULT_BATCH_QUEUE='b'" "-DPERM_PATH=\"/usr/lib/cron/\"" "-DOPEN_DIRECTORY" "-DNO_DIRECT_RPC" diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 036cd3f28a1..e66ac4d65ab 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2018-04-16"; + version = "2019-09-06"; src = fetchFromGitHub { - owner = "dorimanx"; + owner = "AdrianBan"; repo = "exfat-nofuse"; - rev = "01c30ad52625a7261e1b0d874553b6ca7af25966"; - sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6"; + rev = "5536f067373c196f152061f5000fe0032dc07c48"; + sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; }; hardeningDisable = [ "pic" ]; @@ -27,18 +27,9 @@ stdenv.mkDerivation rec { install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko ''; - patches = [ - # fix compile-errors in 4.18 and 4.20 - # ref: https://github.com/dorimanx/exfat-nofuse/pull/137 - (fetchpatch { - url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ; - sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5"; - } ) - ]; - meta = { description = "exfat kernel module"; - homepage = https://github.com/dorimanx/exfat-nofuse; + inherit (src.meta) homepage; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4ad222b83e4..3b409f15aba 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -52,6 +52,9 @@ let CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes; PM_WAKELOCKS = yes; + # Power-capping framework and support for INTEL RAPL + POWERCAP = yes; + INTEL_RAPL = module; }; external-firmware = { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 290a17f69f6..07f5974a2fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.144"; + version = "4.14.146"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0m6a0ggg6sxhpzmmbczwxpil5s0ndlvf4bd6zx4v4q50bdkq92yb"; + sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index e1c1a260375..a3d2235e9de 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.73"; + version = "4.19.75"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1asz4zyfw7iyg68x3h8r5pgbqpk4vpblfzcb295xmn52y9zfgdbx"; + sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a256d406bbf..9ca235ae24c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.193"; + version = "4.4.194"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a"; + sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index b43af36bca0..e5b2d0d386b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.193"; + version = "4.9.194"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv"; + sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 27459e9ac6d..34b86ddab9a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.15"; + version = "5.2.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb"; + sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index e9cb412d8db..b3a96e356ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3"; + version = "5.3.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq"; + sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 1b4700a2e39..6c24311338a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // { copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) '' copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb + copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb ''; diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index a09bb2a6ceb..f2bf5c94970 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }: +, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 +, json-glib, libunistring }: stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.9.905"; + version = "0.10"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y"; + sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb"; }; nativeBuildInputs = [ @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib systemd udev libevdev + glib systemd udev libevdev json-glib libunistring (python3.withPackages (ps: with ps; [ evdev pygobject3 ])) ]; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 5aa9e9b43da..8638ac9f798 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile + -e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile sed -i \ -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \ -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \ diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 07d6dcb4a5f..0196718cfd0 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20190618"; + version = "20190918"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs"; + sha256 = "0v668mfqxn6wzyng68aqaffh75gc215k13n6d5g7zisivvv2bgdp"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index e177b284bbd..1229c442fa2 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.2.903"; + version = "0.3"; format = "other"; @@ -12,12 +12,16 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; + sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; + buildInputs = [ + gtk3 glib gnome3.adwaita-icon-theme python3 + ]; + propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ + gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 81e5a2af9cd..d2c3c11c939 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchurl, pciutils }: +{ stdenv, fetchurl +, autoreconfHook +, pciutils +, pkgconfig +, xorg +}: -stdenv.mkDerivation { - name = "radeontool-1.5"; - - inherit pciutils; - - # Don't know wether it's a good idea to hardcode the lspci path.. - # But it will work on nix.. - postUnpack = '' - cd $sourceRoot - sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c - cd .. - ''; +stdenv.mkDerivation rec { + pname = "radeontool"; + version = "1.6.3"; src = fetchurl { - url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz; - sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar"; + url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz"; + sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za"; }; - installPhase = '' - mkdir -p $out/bin - chmod +x lightwatch.pl - cp radeontool lightwatch.pl $out/bin - ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ xorg.libpciaccess ]; - meta = { - description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; - homepage = http://fdd.com/software/radeon/; - license = stdenv.lib.licenses.zlib; - broken = true; + meta = with stdenv.lib; { + description = "Lowlevel tools to tweak register and dump state on radeon GPUs"; + homepage = "https://airlied.livejournal.com/"; + license = licenses.zlib; }; } diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 81c1f8ab0f5..68364580346 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; }; - nativeBuildInputs = [ bc ]; + nativeBuildInputs = [ bc nukeReferences ]; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + meta = with stdenv.lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index ca63c5c6a8d..1829bd6763f 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; }; - nativeBuildInputs = [ bc ]; + nativeBuildInputs = [ bc nukeReferences ]; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + meta = with stdenv.lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; homepage = https://github.com/zebulon2/rtl8812au; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 447f9127d60..94ba31d59e1 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtlwifi_new"; - version = "2018-02-17"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtlwifi_new"; - rev = "0588ac0cc5f530e7764705416370b70d3c2afedc"; - sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m"; + rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; + sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 90b33e183ce..a7ed32ab696 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,10 +15,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let - pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); - -in stdenv.mkDerivation { +stdenv.mkDerivation { version = "243"; pname = "systemd"; @@ -223,7 +220,7 @@ in stdenv.mkDerivation { # in a backwards-incompatible way. If the interface version of two # systemd builds is the same, then we can switch between them at # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 3; + passthru.interfaceVersion = 2; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 65690af9869..2764c4232c1 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.windows; + + broken = true; }; } diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 675f1beb891..56fa95391cc 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "caddy"; - version = "1.0.0"; + version = "1.0.3"; - goPackagePath = "github.com/mholt/caddy"; + goPackagePath = "github.com/caddyserver/caddy"; subPackages = [ "caddy" ]; src = fetchFromGitHub { - owner = "mholt"; - repo = "caddy"; + owner = "caddyserver"; + repo = pname; rev = "v${version}"; - sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz"; + sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw"; }; - modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs"; + modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q"; buildFlagsArray = '' -ldflags= - -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} + -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index b7c2e01e97a..e993f70b105 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul"; - version = "1.6.0"; + version = "1.6.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52"; + sha256 = "00dvvxi7y80v2b6wzwyfzhxv1ksnl1m0nmdjl98dhq5ikb0v7p28"; }; preBuild = '' diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 24e607f4b00..ae083f17ada 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ]; - configureFlags = [ - "--with-libc=libc.so.6" - ]; + configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"]; + + dontAddDisableDepTrack = stdenv.isDarwin; meta = with stdenv.lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; homepage = "https://www.inet.no/dante/"; maintainers = [ maintainers.arobyn ]; license = licenses.bsdOriginal; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 21aa31d6235..799b73294e8 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "dex"; version = "2.17.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; }; - modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi"; + goPackagePath = "github.com/dexidp/dex"; subPackages = [ "cmd/dex" @@ -22,8 +22,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share - cp -r $src/web $out/share/web + mkdir -p $bin/share + cp -r $src/web $bin/share/web ''; meta = with lib; { diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index af914ae6cd7..31e1ac50942 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,15 +8,13 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.14.4"; in - stdenv.mkDerivation rec { pname = "bind"; - inherit version; + version = "9.14.6"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; + sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 8191bf5acbf..ad1bb26a54d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; + sha256 = "541e7e43503765c91405c5797b3838103bb656154712e69b3f959c6ab0e700a9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index 26c320499e5..a8de0d7e084 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,39 +1,30 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkgconfig, cmake, ninja , libressl, libuv, zlib }: -with builtins; - stdenv.mkDerivation rec { - pname = "h2o"; - version = "2.2.6"; + pname = "h2o"; + version = "2.3.0-beta2"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; rev = "refs/tags/v${version}"; - sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7"; + sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n"; }; - # We have to fix up some function prototypes, because despite upstream h2o - # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't - # seem to work - patchPhase = '' - substituteInPlace ./deps/neverbleed/neverbleed.c \ - --replace 'static void RSA_' 'void RSA_' \ - --replace 'static int RSA_' 'int RSA_' - ''; + outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ libressl libuv zlib ]; - meta = { + meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; homepage = https://h2o.examp1e.net; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8d015a92a8f..88a26a22917 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.11.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a"; + sha256 = "05qplbwki8kcj0xy9d39gf8lhwwg2cx24waxd1q5cb0fq9a5hprm"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 5ee491a0b8a..2908c14b4e0 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d"; + sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d"; }; postPatch = '' diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 1445d0b523c..df3022536ea 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "miniflux"; version = "2.0.17"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm"; }; - modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; + goPackagePath = "miniflux.app"; doCheck = true; @@ -20,7 +20,7 @@ buildGoModule rec { ''; postInstall = '' - mv $out/bin/miniflux.app $out/bin/miniflux + mv $bin/bin/miniflux.app $bin/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 615edeb81ec..3d61961321d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.3.5"; + version = "6.3.6"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2"; + sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101"; + sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/pkgs/servers/monitoring/plugins/openvpn.nix new file mode 100644 index 00000000000..2b7e69ab8f0 --- /dev/null +++ b/pkgs/servers/monitoring/plugins/openvpn.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "check-openvpn"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "liquidat"; + repo = "nagios-icinga-openvpn"; + rev = version; + sha256 = "1vz3p7nckc5k5f06nm1xfzpykhyndh2dzyagmifrzg5k478p1lpm"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A nagios/icinga/sensu check plugin for OpenVPN"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix new file mode 100644 index 00000000000..c1d7f792830 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "apcupsd-exporter"; + version = "unstable-2019-03-14"; + + goPackagePath = "github.com/mdlayher/apcupsd_exporter"; + + goDeps = ./apcupsd-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "apcupsd_exporter"; + rev = "cbd49be"; + sha256 = "1h5z295m9bddch5bc8fppn02b31h370yns6026a1d4ygfy3w46y0"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; + homepage = "https://github.com/mdlayher/apcupsd_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix new file mode 100644 index 00000000000..3950ae89bf2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix @@ -0,0 +1,93 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mdlayher/apcupsd"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/apcupsd"; + rev = "eb3dd99a75fe"; + sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "4724e9255275"; + sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "351d144fa1fc"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } +] diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index bf2a5935d1d..eb95077dc24 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "telegraf"; - version = "1.10.2"; + version = "1.12.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,20 +14,19 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = version; - sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; + sha256 = "00cd4kskdswcinv5bhwimggi0vbznq3sb2dllkhidx0bird3wdiw"; }; buildFlagsArray = [ ''-ldflags= - -X main.version=${version} + -w -s -X main.version=${version} '' ]; - goDeps = ./. + "/deps-${version}.nix"; + goDeps = ./deps.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.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix b/pkgs/servers/monitoring/telegraf/deps.nix index 2655595ee69..952d78980b0 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps.nix @@ -67,9 +67,9 @@ goPackagePath = "github.com/Shopify/sarama"; fetch = { type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "a6144ae922fd99dd0ea5046c8137acfb7fab0914"; - sha256 = "13x23kmjg7milzc34a0acll5b6q6yh9jfh7qjh6zran1inp9lnba"; + url = "https://github.com/influxdata/sarama.git"; + rev = "b12709e6ca29240128c89fe0b30b6a76be42b457"; + sha256 = "0hp8g1qwcir2356y48a1qsbhc8qvb44lswhlrc5vgnzscq54zj35"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "bf8067ceb6e7f51e150c218972dccfeeed892b85"; - sha256 = "0kxw0blzxr5vc5c0il7hh178vv86ib7af3j9pnzsfzhm3byw0ccx"; + rev = "5312c8dac9067d339c4e68d7e0dd5507b2f01849"; + sha256 = "1ddm89qbnmnr6dh040m7093mn2zk15ncvdnw9w1ifj75sn5q69pn"; }; } { @@ -136,15 +136,6 @@ }; } { - goPackagePath = "github.com/bsm/sarama-cluster"; - fetch = { - type = "git"; - url = "https://github.com/bsm/sarama-cluster"; - rev = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"; - sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19"; - }; - } - { goPackagePath = "github.com/caio/go-tdigest"; fetch = { type = "git"; @@ -163,6 +154,15 @@ }; } { + goPackagePath = "github.com/cisco-ie/nx-telemetry-proto"; + fetch = { + type = "git"; + url = "https://github.com/cisco-ie/nx-telemetry-proto"; + rev = "82441e232cf6af9be0f808bf0c6421ee8519880e"; + sha256 = "15l4a71hmw6w9pkq2dh1lpjb7sjq0v57qn8wkdhsyls3f2bczw9p"; + }; + } + { goPackagePath = "github.com/couchbase/go-couchbase"; fetch = { type = "git"; @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/denisenkom/go-mssqldb"; - rev = "1eb28afdf9b6e56cf673badd47545f844fe81103"; - sha256 = "1p2x2k7azbp4cwdjn1nv0zzaf0fvxaysnjrlyxskqlm2cq5vp5ab"; + rev = "2be1aa521ff4499e74b7861a2779ba1e96e3e2c5"; + sha256 = "0c502ycxg7sdnpvwky5wm2xbxw03lspsjxbmvpabp78dlf3gnmhb"; }; } { @@ -302,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"; - sha256 = "1vgxdv4f1g92jx5sj143y3jc18sfd712il4rbaxckgrpsb7gq8ch"; + rev = "adca289fdcf8c883800aafa545bc263452290bae"; + sha256 = "1f81ia8pkfz2084bla4kirrh7yrfg8dy11gsi84m75j25nf762zn"; }; } { @@ -325,12 +325,12 @@ }; } { - goPackagePath = "github.com/go-ini/ini"; + goPackagePath = "github.com/glinton/ping"; fetch = { type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; - sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; + url = "https://github.com/glinton/ping"; + rev = "1983bc2fd5de3ea00aa5457bbc8774300e889db9"; + sha256 = "0ixxdwknb2pr1gsp9ay41pl6lhbzz487h43hnynix3gxl38lg6rc"; }; } { @@ -365,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/go-sql-driver/mysql"; - rev = "d523deb1b23d913de5bdada721a6071e71283618"; - sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; }; } { @@ -415,6 +415,24 @@ }; } { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "7462feb2032c2da9e3b85e9b04e6853a6e9e14ca"; + sha256 = "1sk43llk5fgb00l99rmrmfrk81da2gsvjl1m6r1k1chpjaghxj11"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "44c6ddd0a2342c386950e880b658017258da92fc"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; @@ -496,6 +514,15 @@ }; } { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; + }; + } + { goPackagePath = "github.com/hashicorp/serf"; fetch = { type = "git"; @@ -527,8 +554,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/toml"; - rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; - sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; + rev = "270119a8ce653b297f12189c9099ef1409979f2b"; + sha256 = "1dprq2nx1kh78fqr6awir27ankjkbsjw2rza07ri5m2pxd3kxhsv"; }; } { @@ -545,8 +572,17 @@ fetch = { type = "git"; url = "https://github.com/jackc/pgx"; - rev = "89f1e6ac7276b61d885db5e5aed6fcbedd1c7e31"; - sha256 = "0qln29f443m9sw6yf0xy8m45wag9jg87hbwiplb511d5783l7jwk"; + rev = "8faa4453fc7051d1076053f8854077753ab912f2"; + sha256 = "0zx52pidklrmxkxja0i38zn4yq6z909jvyb30xr48qlsbjn5y6zx"; + }; + } + { + goPackagePath = "github.com/jcmturner/gofork"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gofork"; + rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; + sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; }; } { @@ -554,8 +590,8 @@ fetch = { type = "git"; url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } { @@ -640,6 +676,15 @@ }; } { + goPackagePath = "github.com/mdlayher/apcupsd"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/apcupsd"; + rev = "2fe55d9e1d0704d3c6f03f69a1fd9ebe2aef9df1"; + sha256 = "1y8wabqln92h2g71aglgf0cp66b7zj8zb2wb03jhpfm75ssv1yyb"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; @@ -721,6 +766,15 @@ }; } { + goPackagePath = "github.com/openconfig/gnmi"; + fetch = { + type = "git"; + url = "https://github.com/openconfig/gnmi"; + rev = "33a1865c302903e7a2e06f35960e6bc31e84b9f6"; + sha256 = "0yzsda16k9kwhq4kvsixsg6cb67vyn177x0h5n1s9zrrdxbvm05c"; + }; + } + { goPackagePath = "github.com/opencontainers/go-digest"; fetch = { type = "git"; @@ -860,8 +914,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; - sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; + rev = "d80c43f9c984a48783daf22f4bd9278006ae483a"; + sha256 = "0zqcdvf0ym6nylz9ac1z38d3src8yws34n7gkvhpn52ikp801asn"; }; } { @@ -923,8 +977,8 @@ fetch = { type = "git"; url = "https://github.com/tidwall/gjson"; - rev = "f123b340873a0084cb27267eddd8ff615115fbff"; - sha256 = "1axph65dv3l0mmr2iis4r5jk2qy5ffdvh4gdxz4pv92jyincf5fj"; + rev = "d7c940e59395fdcaff4584cb442b2e7808f6711e"; + sha256 = "14x1g5gnziyh3vpr5mxpw2r5h65mncn548xdvamrpzngjm1idzhi"; }; } { @@ -937,6 +991,15 @@ }; } { + goPackagePath = "github.com/tidwall/pretty"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/pretty"; + rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; + sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; + }; + } + { goPackagePath = "github.com/vishvananda/netlink"; fetch = { type = "git"; @@ -1030,7 +1093,7 @@ goPackagePath = "golang.org/x/net"; fetch = { type = "git"; - url = "https://go.googlesource.com/net"; + url = "https://github.com/golang/net.git"; rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; }; @@ -1039,7 +1102,7 @@ goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; - url = "https://go.googlesource.com/oauth2"; + url = "https://github.com/golang/oauth2.git"; rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; }; @@ -1057,9 +1120,9 @@ goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c4c994c65f702f41ed7d6620a2cb34107576a77"; - sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi"; + url = "https://github.com/golang/sys.git"; + rev = "51ab0e2deafac1f46c46ad59cf0921be2f180c3d"; + sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a"; }; } { @@ -1153,6 +1216,42 @@ }; } { + goPackagePath = "gopkg.in/jcmturner/aescts.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/aescts"; + rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; + sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/dnsutils"; + rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; + sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/gokrb5.v7"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gokrb5"; + rev = "363118e62befa8a14ff01031c025026077fe5d6d"; + sha256 = "08mbag2283q1pyfi696g80521r9n1id3804r6sssrhf3kxzkfhnv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/rpc.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/rpc"; + rev = "99a8ce2fbf8b8087b6ed12a37c61b10f04070043"; + sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175"; + }; + } + { goPackagePath = "gopkg.in/ldap.v2"; fetch = { type = "git"; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 5a5342b91d3..5ecf34282d7 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj"; + sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367"; }; postPatch = '' diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 95084458f47..d58d2bff813 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos }: +, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,6 +11,20 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ + # Linux 5.3 + (fetchpatch { + name = "openafs_1_8-recurse-keyring_search.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989"; + sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs"; + }) + (fetchpatch { + name = "openafs_1_8-send-sig.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613"; + sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag"; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index cbe0dae3e14..b617fe6fa0e 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.5.1554-1e5ff713d"; + version = "1.16.6.1592-b9d49bdb7"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n"; + sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index b188b2295a8..b0fdd333238 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -3,7 +3,7 @@ , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons -, less +, less, fetchpatch , withoutClient ? false }: @@ -48,12 +48,20 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt + '' + optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace cmake/build_configurations/mysql_release.cmake \ + --replace "SET(PLUGIN_AUTH_PAM YES)" "" ''; patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ]; + ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch { + url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch"; + extraPrefix = "libmariadb/"; + sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk"; + stripLen = 1; + }); cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 4a9af9d329c..9dbf060aa9a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq"; + sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr"; }; installPhase = '' diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix new file mode 100644 index 00000000000..62efabb022c --- /dev/null +++ b/pkgs/shells/liquidprompt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "liquidprompt"; + version = "unstable-2018-05-21"; + + src = fetchFromGitHub { + owner = "nojhan"; + repo = pname; + rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971"; + sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4"; + }; + + installPhase = '' + install -D -m 0444 liquidprompt $out/bin/liquidprompt + install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist + install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme + + install -D -m 0444 liquidprompt.plugin.zsh \ + $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh + install -D -m 0444 liquidprompt \ + $out/share/zsh/plugins/liquidprompt/liquidprompt + ''; + + meta = with stdenv.lib; { + description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; + homepage = https://github.com/nojhan/liquidprompt; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ gerschtli ]; + }; +} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8aa66d65fad..7df43f7dab4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-09-11"; + version = "2019-09-20"; pname = "oh-my-zsh"; - rev = "ddd359dd668f448856438304bedfe952d1749efd"; + rev = "6cfaa076272e08b6a81b6358b78d020e48f8a4a6"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "027f0si4ah8ppwypxip3ximkwbh4n9ghv7kip2cfj5h5nqlg786q"; + sha256 = "0i1mlw42g2w5pbg6zsl48pdwv1hy5zrwx9kq4w04mynwg7mc9hs5"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 422294150e0..35355fe374d 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-completions"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "zsh-users"; - repo = "zsh-completions"; + repo = pname; rev = version; - sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l"; + sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk"; }; installPhase= '' diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 8f62bd24dda..041964bcacc 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -62,7 +62,6 @@ rec { ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); - static = true; }; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index f53ef4a16fa..923344c6411 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "certigo"; version = "1.11.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b"; }; - modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj"; + goPackagePath = "github.com/square/certigo"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index bc9aa6bf379..e8efc7d9cfe 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.7"; - versionMinor = "6"; - versionBuild_x86_64 = "11"; - versionBuild_i686 = "11"; + versionMajor = "6.8"; + versionMinor = "1"; + versionBuild_x86_64 = "1"; + versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0"; + sha256 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx"; + sha256 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index de09931e7c1..a7199c66547 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.27"; + version = "1.1.0"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { x86_64-linux = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; + sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224"; }; x86_64-darwin = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; + sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg"; }; }; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 21e748cc79d..241e552b05c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -17,9 +17,12 @@ , enableKeyfinder ? true, keyfinder-cli ? null , enableKodiupdate ? true , enableLastfm ? true +, enableLoadext ? true , enableMpd ? true +, enablePlaylist ? true , enableReplaygain ? true, bs1770gain ? null , enableSonosUpdate ? true +, enableSubsonicupdate ? true , enableThumbnails ? true , enableWeb ? true @@ -60,10 +63,13 @@ let kodiupdate = enableKodiupdate; lastgenre = enableLastfm; lastimport = enableLastfm; + loadext = enableLoadext; mpdstats = enableMpd; mpdupdate = enableMpd; + playlist = enablePlaylist; replaygain = enableReplaygain; sonosupdate = enableSonosUpdate; + subsonicupdate = enableSubsonicupdate; thumbnails = enableThumbnails; web = enableWeb; }; @@ -102,13 +108,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "beets"; - version = "1.4.7"; + version = "1.4.9"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; rev = "v${version}"; - sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l"; + sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8"; }; propagatedBuildInputs = [ @@ -127,6 +133,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional (enableFetchart || enableEmbyupdate || enableKodiupdate + || enableLoadext + || enablePlaylist + || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests ++ optional enableConvert ffmpeg @@ -160,14 +169,6 @@ in pythonPackages.buildPythonApplication rec { patches = [ ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch - - # Fix Python 3.7 compatibility - (fetchpatch { - url = "https://github.com/beetbox/beets/commit/" - + "15d44f02a391764da1ce1f239caef819f08beed8.patch"; - sha256 = "12rjb4959nvnrm3fvvki7chxjkipa0cy8i0yi132xrcn8141dnpm"; - excludes = [ "docs/changelog.rst" ]; - }) ]; postPatch = '' diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 3097756ddf8..3ff7aed74f5 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.29.2"; in +let version = "0.29.3"; in with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "17lpbyhf43gcln5s43m2zzgichcx7jq6ragcawfklw6svg1vnj89"; + sha256 = "1b5ynljd9gs1vzbsa0kggw32s3r4zhbprc2clvjm5qmvnx23hxh8"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch deleted file mode 100644 index 5626800e723..00000000000 --- a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001 -From: Chris Lamb <lamby@debian.org> -Date: Mon, 21 Nov 2016 09:33:05 +0100 -Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that - value. - -See https://reproducible-builds.org/specs/source-date-epoch/ for more -information about this environment variable. - -Based on a patch by Alexander Couzens <lynxis@fe...> posted on -https://sourceforge.net/p/squashfs/mailman/message/34673610/ - -Signed-off-by: Chris Lamb <lamby@debian.org> ---- - squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++- - 1 file changed, 37 insertions(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index c2098bd..b49e956 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; - /* inode lookup table */ - squashfs_inode *inode_lookup_table = NULL; - -+/* override filesystem creation time */ -+time_t mkfs_fixed_time = -1; -+ - /* in memory directory data */ - #define I_COUNT_SIZE 128 - #define DIR_ENTRIES 32 -@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[]) - int total_mem = get_default_phys_mem(); - int progress = TRUE; - int force_progress = FALSE; -+ char *source_date_epoch, *endptr; -+ unsigned long long epoch; -+ - struct file_buffer **fragment = NULL; - - if(argc > 1 && strcmp(argv[1], "-version") == 0) { -@@ -5641,6 +5647,36 @@ printOptions: - } - } - -+ /* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */ -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if(source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "strtoull: %s\n", strerror(errno)); -+ EXIT_MKSQUASHFS(); -+ } -+ if(endptr == source_date_epoch) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "No digits were found: %s\n", endptr); -+ EXIT_MKSQUASHFS(); -+ } -+ if(*endptr != '\0') { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "Trailing garbage: %s\n", endptr); -+ EXIT_MKSQUASHFS(); -+ } -+ if(epoch > ULONG_MAX) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "value must be smaller than or equal to " -+ "%lu but was found to be: %llu \n", ULONG_MAX, epoch); -+ EXIT_MKSQUASHFS(); -+ } -+ mkfs_fixed_time = (time_t)epoch; -+ } -+ - /* - * Some compressors may need the options to be checked for validity - * once all the options have been processed -@@ -5993,7 +6029,7 @@ printOptions: - sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments, - always_use_fragments, duplicate_checking, exportable, - no_xattrs, comp_opts); -- sBlk.mkfs_time = time(NULL); -+ sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL); - - disable_info(); - --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch deleted file mode 100644 index 5002375887f..00000000000 --- a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001 -From: intrigeri <intrigeri@boum.org> -Date: Mon, 21 Nov 2016 11:41:28 +0000 -Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps - with that value. - -Based on a patch by Alexander Couzens <lynxis@fe...> posted on -https://sourceforge.net/p/squashfs/mailman/message/34673610/ ---- - squashfs-tools/mksquashfs.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index b49e956..9f020bf 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; - /* inode lookup table */ - squashfs_inode *inode_lookup_table = NULL; - -+/* clamp all timestamps to SOURCE_DATE_EPOCH */ -+time_t content_clamp_time = -1; -+ - /* override filesystem creation time */ - time_t mkfs_fixed_time = -1; - -@@ -2246,6 +2249,8 @@ restat: - pathname_reader(dir_ent), strerror(errno)); - goto read_err; - } -+ if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time) -+ buf2.st_mtime = content_clamp_time; - - if(read_size != buf2.st_size) { - close(file); -@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname, - buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR; - buf.st_uid = getuid(); - buf.st_gid = getgid(); -- buf.st_mtime = time(NULL); -+ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); - buf.st_dev = 0; - buf.st_ino = 0; - dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0); -@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname, - /* source directory has disappeared? */ - BAD_ERROR("Cannot stat source directory %s because %s\n", - pathname, strerror(errno)); -+ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) -+ buf.st_mtime = content_clamp_time; - dir_ent->inode = lookup_inode(&buf); - } - -@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath, - free_dir_entry(dir_ent); - continue; - } -+ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) -+ buf.st_mtime = content_clamp_time; - - if((buf.st_mode & S_IFMT) != S_IFREG && - (buf.st_mode & S_IFMT) != S_IFDIR && -@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo) - buf.st_gid = pseudo_ent->dev->gid; - buf.st_rdev = makedev(pseudo_ent->dev->major, - pseudo_ent->dev->minor); -- buf.st_mtime = time(NULL); -+ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); - buf.st_ino = pseudo_ino ++; - - if(pseudo_ent->dev->type == 'd') { -@@ -5674,7 +5683,7 @@ printOptions: - "%lu but was found to be: %llu \n", ULONG_MAX, epoch); - EXIT_MKSQUASHFS(); - } -- mkfs_fixed_time = (time_t)epoch; -+ mkfs_fixed_time = content_clamp_time = (time_t)epoch; - } - - /* --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch deleted file mode 100644 index 4be4b96369a..00000000000 --- a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch +++ /dev/null @@ -1,220 +0,0 @@ -From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001 -From: Alexander Couzens <lynxis@fe80.eu> -Date: Fri, 13 Jan 2017 22:00:37 +0100 -Subject: [PATCH] remove frag_deflator_thread - -frag_deflator_thread compress fragments. -Replace the deflator_thread with a function and -use the function instead of the to_frag queue. ---- - squashfs-tools/info.c | 5 --- - squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------ - squashfs-tools/mksquashfs.h | 2 +- - squashfs-tools/restore.c | 15 +------- - 4 files changed, 30 insertions(+), 68 deletions(-) - -diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index 7968c77..028d578 100644 ---- a/squashfs-tools/info.c -+++ b/squashfs-tools/info.c -@@ -96,11 +96,6 @@ void dump_state() - printf("compressed block queue (deflate thread(s) -> main thread)\n"); - dump_seq_queue(to_main, 0); - -- printf("uncompressed packed fragment queue (main thread -> fragment" -- " deflate thread(s))\n"); -- dump_queue(to_frag); -- -- - printf("locked frag queue (compressed frags waiting while multi-block" - " file is written)\n"); - dump_queue(locked_fragment); -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index cf48e40..cacf14c 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0; - struct cache *reader_buffer, *fragment_buffer, *reserve_cache; - struct cache *bwriter_buffer, *fwriter_buffer; - struct queue *to_reader, *to_deflate, *to_writer, *from_writer, -- *to_frag, *locked_fragment, *to_process_frag; -+ *locked_fragment, *to_process_frag; - struct seq_queue *to_main; - pthread_t reader_thread, writer_thread, main_thread; --pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; -+pthread_t *deflator_thread, *frag_thread; - pthread_t *restore_thread = NULL; - pthread_mutex_t fragment_mutex = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_t pos_mutex = PTHREAD_MUTEX_INITIALIZER; -@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth); - void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad); - unsigned short get_checksum_mem(char *buff, int bytes); - void check_usable_phys_mem(int total_mem); -- -+void frag_deflator(struct file_buffer *file_buffer); - - void prep_exit() - { -@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment) - pthread_mutex_lock(&fragment_mutex); - fragment_table[fragment->block].unused = 0; - fragments_outstanding ++; -- queue_put(to_frag, fragment); -+ frag_deflator(fragment); - pthread_cleanup_pop(1); - } - -@@ -2412,51 +2412,34 @@ void *deflator(void *arg) - } - - --void *frag_deflator(void *arg) -+void frag_deflator(struct file_buffer *file_buffer) - { -- void *stream = NULL; -- int res; - -- res = compressor_init(comp, &stream, block_size, 1); -- if(res) -- BAD_ERROR("frag_deflator:: compressor_init failed\n"); -- -- pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex); -- -- while(1) { -- int c_byte, compressed_size; -- struct file_buffer *file_buffer = queue_get(to_frag); -- struct file_buffer *write_buffer = -+ int c_byte, compressed_size; -+ struct file_buffer *write_buffer = - cache_get(fwriter_buffer, file_buffer->block); - -- c_byte = mangle2(stream, write_buffer->data, file_buffer->data, -- file_buffer->size, block_size, noF, 1); -- compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -- write_buffer->size = compressed_size; -- pthread_mutex_lock(&fragment_mutex); -- if(fragments_locked == FALSE) { -- fragment_table[file_buffer->block].size = c_byte; -- fragment_table[file_buffer->block].start_block = bytes; -- write_buffer->block = bytes; -- bytes += compressed_size; -- fragments_outstanding --; -- queue_put(to_writer, write_buffer); -- pthread_mutex_unlock(&fragment_mutex); -- TRACE("Writing fragment %lld, uncompressed size %d, " -- "compressed size %d\n", file_buffer->block, -- file_buffer->size, compressed_size); -- } else { -- add_pending_fragment(write_buffer, c_byte, -- file_buffer->block); -- pthread_mutex_unlock(&fragment_mutex); -- } -- cache_block_put(file_buffer); -+ c_byte = mangle2(stream, write_buffer->data, file_buffer->data, -+ file_buffer->size, block_size, noF, 1); -+ compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -+ write_buffer->size = compressed_size; -+ if(fragments_locked == FALSE) { -+ fragment_table[file_buffer->block].size = c_byte; -+ fragment_table[file_buffer->block].start_block = bytes; -+ write_buffer->block = bytes; -+ bytes += compressed_size; -+ fragments_outstanding --; -+ queue_put(to_writer, write_buffer); -+ TRACE("Writing fragment %lld, uncompressed size %d, " -+ "compressed size %d\n", file_buffer->block, -+ file_buffer->size, compressed_size); -+ } else { -+ add_pending_fragment(write_buffer, c_byte, -+ file_buffer->block); - } -- -- pthread_cleanup_pop(0); -+ cache_block_put(file_buffer); - } - -- - struct file_buffer *get_file_buffer() - { - struct file_buffer *file_buffer = seq_queue_get(to_main); -@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - multiply_overflow(processors * 3, sizeof(pthread_t))) - BAD_ERROR("Processors too large\n"); - -- deflator_thread = malloc(processors * 3 * sizeof(pthread_t)); -+ deflator_thread = malloc(processors * 2 * sizeof(pthread_t)); - if(deflator_thread == NULL) - MEM_ERROR(); - -- frag_deflator_thread = &deflator_thread[processors]; -- frag_thread = &frag_deflator_thread[processors]; -+ frag_thread = &deflator_thread[processors]; - - to_reader = queue_init(1); - to_deflate = queue_init(reader_size); - to_process_frag = queue_init(reader_size); - to_writer = queue_init(bwriter_size + fwriter_size); - from_writer = queue_init(1); -- to_frag = queue_init(fragment_size); - locked_fragment = queue_init(fragment_size); - to_main = seq_queue_init(); - reader_buffer = cache_init(block_size, reader_size, 0, 0); -@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - for(i = 0; i < processors; i++) { - if(pthread_create(&deflator_thread[i], NULL, deflator, NULL)) - BAD_ERROR("Failed to create thread\n"); -- if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator, -- NULL) != 0) -- BAD_ERROR("Failed to create thread\n"); - if(pthread_create(&frag_thread[i], NULL, frag_thrd, - (void *) destination_file) != 0) - BAD_ERROR("Failed to create thread\n"); -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 55708a3..dc5bde4 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -135,7 +135,7 @@ struct append_file { - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; - struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, -- *to_frag, *locked_fragment, *to_process_frag; -+ *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; - extern struct seq_queue *to_main; - extern pthread_mutex_t fragment_mutex, dup_mutex; -diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c -index 5e336b3..a7aaf2e 100644 ---- a/squashfs-tools/restore.c -+++ b/squashfs-tools/restore.c -@@ -47,8 +47,8 @@ - #define TRUE 1 - - extern pthread_t reader_thread, writer_thread, main_thread; --extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; --extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag; -+extern pthread_t *deflator_thread, *frag_thread; -+extern struct queue *to_deflate, *to_writer, *to_process_frag; - extern struct seq_queue *to_main; - extern void restorefs(); - extern int processors; -@@ -120,17 +120,6 @@ void *restore_thrd(void *arg) - pthread_cancel(main_thread); - pthread_join(main_thread, NULL); - -- /* then flush the main thread to fragment deflator thread(s) -- * queue. The fragment deflator thread(s) will idle -- */ -- queue_flush(to_frag); -- -- /* now kill the fragment deflator thread(s) */ -- for(i = 0; i < processors; i++) -- pthread_cancel(frag_deflator_thread[i]); -- for(i = 0; i < processors; i++) -- pthread_join(frag_deflator_thread[i], NULL); -- - /* - * then flush the main thread/fragment deflator thread(s) - * to writer thread queue. The writer thread will idle --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch b/pkgs/tools/filesystems/squashfs/4k-align.patch index c9c3dd3d760..e73c0678875 100644 --- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch +++ b/pkgs/tools/filesystems/squashfs/4k-align.patch @@ -1,3 +1,7 @@ +This patch has been edited to apply to squashfs 4.4, commit +52eb4c279cd283ed9802dd1ceb686560b22ffb67. Below is the original +message body of the patch. + From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001 From: Amin Hassani <ahassani@google.com> Date: Thu, 15 Dec 2016 10:43:15 -0800 @@ -16,20 +20,24 @@ increased_size = (number_of_unfragmented_files_in_image + number of fragments) * The 4k alignment can be enabled by flag '-4k-align' --- -diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ---- a/squashfs-tools/mksquashfs.c 2019-07-06 15:50:22.214873176 +0000 -+++ b/squashfs-tools/mksquashfs.c 2019-07-06 15:51:22.244802582 +0000 -@@ -100,7 +100,9 @@ + squashfs-tools/mksquashfs.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index a45b77f..07b1c06 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -102,7 +102,9 @@ int old_exclude = TRUE; int use_regex = FALSE; int nopad = FALSE; int exit_on_error = FALSE; +int do_4k_align = FALSE; - static off_t squashfs_start_offset = 0; + long long start_offset = 0; +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) long long global_uid = -1, global_gid = -1; -@@ -1495,6 +1497,9 @@ +@@ -1546,6 +1548,9 @@ void unlock_fragments() * queue at this time. */ while(!queue_empty(locked_fragment)) { @@ -39,17 +47,17 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c write_buffer = queue_get(locked_fragment); frg = write_buffer->block; size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); -@@ -2414,6 +2419,9 @@ - compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); - write_buffer->size = compressed_size; - if(fragments_locked == FALSE) { -+ // 4k align the start of each fragment. -+ if(do_4k_align) -+ ALIGN_UP(bytes, 4096); - fragment_table[file_buffer->block].size = c_byte; - fragment_table[file_buffer->block].start_block = bytes; - write_buffer->block = bytes; -@@ -2728,6 +2736,10 @@ +@@ -2478,6 +2483,9 @@ void *frag_deflator(void *arg) + write_buffer->size = compressed_size; + pthread_mutex_lock(&fragment_mutex); + if(fragments_locked == FALSE) { ++ // 4k align the start of each fragment. ++ if(do_4k_align) ++ ALIGN_UP(bytes, 4096); + fragment_table[file_buffer->block].size = c_byte; + fragment_table[file_buffer->block].start_block = bytes; + write_buffer->block = bytes; +@@ -2877,6 +2885,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent, long long sparse = 0; struct file_buffer *fragment_buffer = NULL; @@ -60,7 +68,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c if(pre_duplicate(read_size)) return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); -@@ -4808,6 +4820,7 @@ +@@ -4972,6 +4984,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad) "compressed", no_fragments ? "no" : noF ? "uncompressed" : "compressed", no_xattrs ? "no" : noX ? "uncompressed" : "compressed", noI || noId ? "uncompressed" : "compressed"); @@ -68,7 +76,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : "not "); printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, -@@ -5570,6 +5583,8 @@ +@@ -5853,6 +5866,8 @@ print_compressor_options: root_name = argv[i]; } else if(strcmp(argv[i], "-version") == 0) { VERSION(); @@ -77,7 +85,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c } else { ERROR("%s: invalid option\n\n", argv[0]); printOptions: -@@ -5613,6 +5628,7 @@ +@@ -5904,6 +5919,7 @@ printOptions: ERROR("\t\t\tdirectory containing that directory, " "rather than the\n"); ERROR("\t\t\tcontents of the directory\n"); @@ -85,3 +93,6 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ERROR("\nFilesystem filter options:\n"); ERROR("-p <pseudo-definition>\tAdd pseudo file " "definition\n"); +-- +2.23.0 + diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch index 6022e65be47..eb2dc24ec1a 100644 --- a/pkgs/tools/filesystems/squashfs/darwin.patch +++ b/pkgs/tools/filesystems/squashfs/darwin.patch @@ -1,5 +1,11 @@ +Patch based on commits by Dave Vasilevsky <dave@vasilevsky.ca> and +Blake Riley <blake.riley@gmail.com>, squashed into a single patch, +with BSD-specific changes omitted. + +See also https://github.com/plougher/squashfs-tools/pull/69. + diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index 4b06ccb..26365e7 100644 +index 4b06ccb..3cad2ab 100644 --- a/squashfs-tools/action.c +++ b/squashfs-tools/action.c @@ -38,6 +38,10 @@ @@ -7,7 +13,7 @@ index 4b06ccb..26365e7 100644 #include <errno.h> +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif + #include "squashfs_fs.h" @@ -28,21 +34,21 @@ index 4b06ccb..26365e7 100644 /* diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index 7968c77..c8e4c52 100644 +index fe23d78..5c2f835 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c -@@ -134,31 +134,22 @@ void dump_state() +@@ -144,31 +144,22 @@ void dump_state() void *info_thrd(void *arg) { sigset_t sigmask; - struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; - int sig, waiting = 0; -+ int sig, err, waiting = 0; ++ int sig, err, waiting = 0; sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); ++ sigaddset(&sigmask, SIGALRM); while(1) { - if(waiting) @@ -64,11 +70,11 @@ index 7968c77..c8e4c52 100644 continue; default: - BAD_ERROR("sigtimedwait/sigwaitinfo failed " -+ BAD_ERROR("sigwaitfailed " ++ BAD_ERROR("sigwait failed " "because %s\n", strerror(errno)); } } -@@ -169,8 +160,12 @@ void *info_thrd(void *arg) +@@ -179,8 +170,12 @@ void *info_thrd(void *arg) /* set one second interval period, if ^\ received within then, dump queue and cache status */ waiting = 1; @@ -83,119 +89,46 @@ index 7968c77..c8e4c52 100644 } diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index d696a51..c86d1b3 100644 +index a45b77f..3607448 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c -@@ -50,6 +50,10 @@ +@@ -35,7 +35,12 @@ + #include <stddef.h> + #include <sys/types.h> + #include <sys/stat.h> ++#ifndef linux ++#include <sys/sysctl.h> ++#else ++#include <sys/sysinfo.h> + #include <sys/sysmacros.h> ++#endif + #include <fcntl.h> + #include <errno.h> + #include <dirent.h> +@@ -50,7 +55,10 @@ + #include <sys/wait.h> #include <limits.h> #include <ctype.h> - +-#include <sys/sysinfo.h> ++ +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif -+ + #ifndef linux #define __BYTE_ORDER BYTE_ORDER - #define __BIG_ENDIAN BIG_ENDIAN -@@ -831,13 +835,13 @@ char *subpathname(struct dir_ent *dir_ent) - } - - --inline unsigned int get_inode_no(struct inode_info *inode) -+static inline unsigned int get_inode_no(struct inode_info *inode) - { - return inode->inode_number; - } - - --inline unsigned int get_parent_no(struct dir_info *dir) -+static inline unsigned int get_parent_no(struct dir_info *dir) - { - return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no; - } -@@ -2030,7 +2034,7 @@ struct file_info *duplicate(long long file_size, long long bytes, - } - - --inline int is_fragment(struct inode_info *inode) -+static inline int is_fragment(struct inode_info *inode) - { - off_t file_size = inode->buf.st_size; - -@@ -2999,13 +3003,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id) - } - - --inline struct inode_info *lookup_inode(struct stat *buf) -+static inline struct inode_info *lookup_inode(struct stat *buf) - { - return lookup_inode2(buf, 0, 0); - } - - --inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) -+static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) - { - if (inode->inode_number == 0) { - inode->inode_number = use_this ? : inode_no ++; -@@ -3016,7 +3020,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) - } - - --inline struct dir_ent *create_dir_entry(char *name, char *source_name, -+static inline struct dir_ent *create_dir_entry(char *name, char *source_name, - char *nonstandard_pathname, struct dir_info *dir) - { - struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent)); -@@ -3034,7 +3038,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name, - } - - --inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, -+static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, - struct inode_info *inode_info) - { - struct dir_info *dir = dir_ent->our_dir; -@@ -3050,7 +3054,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, - } - - --inline void add_dir_entry2(char *name, char *source_name, -+static inline void add_dir_entry2(char *name, char *source_name, - char *nonstandard_pathname, struct dir_info *sub_dir, - struct inode_info *inode_info, struct dir_info *dir) - { -@@ -3062,7 +3066,7 @@ inline void add_dir_entry2(char *name, char *source_name, - } - - --inline void free_dir_entry(struct dir_ent *dir_ent) -+static inline void free_dir_entry(struct dir_ent *dir_ent) - { - if(dir_ent->name) - free(dir_ent->name); -@@ -3083,7 +3087,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent) - } - - --inline void add_excluded(struct dir_info *dir) -+static inline void add_excluded(struct dir_info *dir) - { - dir->excluded ++; - } -@@ -4200,6 +4204,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, +@@ -4348,6 +4356,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); + sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1) + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) BAD_ERROR("Failed to set signal mask in intialise_threads\n"); -@@ -4987,6 +4992,36 @@ int parse_num(char *arg, int *res) +@@ -5195,6 +5204,35 @@ int get_physical_memory() + long long page_size = sysconf(_SC_PAGESIZE); + int phys_mem; - int get_physical_memory() - { -+ int phys_mem; +#ifndef linux + #ifdef HW_MEMSIZE + #define SYSCTL_PHYSMEM HW_MEMSIZE @@ -223,50 +156,21 @@ index d696a51..c86d1b3 100644 + ERROR_EXIT(" Defaulting to least viable amount\n"); + phys_mem = SQUASHFS_LOWMEM; + } -+ #undef SYSCTL_PHYSMEM ++ #undef SYSCTL_PHYSMEM +#else - /* - * Long longs are used here because with PAE, a 32-bit - * machine can have more than 4GB of physical memory -@@ -4996,10 +5031,11 @@ int get_physical_memory() - */ - long long num_pages = sysconf(_SC_PHYS_PAGES); - long long page_size = sysconf(_SC_PAGESIZE); -- int phys_mem = num_pages * page_size >> 20; -+ phys_mem = num_pages * page_size >> 20; + if(num_pages == -1 || page_size == -1) { + struct sysinfo sys; + int res = sysinfo(&sys); +@@ -5207,6 +5245,7 @@ int get_physical_memory() + } - if(num_pages == -1 || page_size == -1) - return 0; + phys_mem = num_pages * page_size >> 20; +#endif if(phys_mem < SQUASHFS_LOWMEM) BAD_ERROR("Mksquashfs requires more physical memory than is " -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 55708a3..d44d1fd 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -24,6 +24,7 @@ - * mksquashfs.h - * - */ -+#include <pthread.h> - - struct dir_info { - char *pathname; -diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c -index cb74cf6..fe2b4bc 100644 ---- a/squashfs-tools/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/stat.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <sys/stat.h> diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c -index 42106f5..837d3fb 100644 +index 4debedf..3257c30 100644 --- a/squashfs-tools/read_xattrs.c +++ b/squashfs-tools/read_xattrs.c @@ -39,13 +39,13 @@ @@ -286,10 +190,10 @@ index 42106f5..837d3fb 100644 extern int read_block(int, long long, long long *, int, void *); diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index f190e96..927e441 100644 +index 727f1d5..c1a6183 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c -@@ -32,7 +32,12 @@ +@@ -32,8 +32,12 @@ #include "stdarg.h" #include "fnmatch_compat.h" @@ -297,21 +201,40 @@ index f190e96..927e441 100644 +#include <sys/sysctl.h> +#else #include <sys/sysinfo.h> + #include <sys/sysmacros.h> +#endif -+ #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> -@@ -2185,6 +2190,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size) +@@ -1080,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i) + break; + case SQUASHFS_SYMLINK_TYPE: + case SQUASHFS_LSYMLINK_TYPE: { +- struct timespec times[2] = { ++ struct timeval times[2] = { + { i->time, 0 }, + { i->time, 0 } + }; +@@ -1099,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i) + goto failed; + } + +- res = utimensat(AT_FDCWD, pathname, times, +- AT_SYMLINK_NOFOLLOW); ++ res = lutimes(pathname, times); + if(res == -1) { + EXIT_UNSQUASH_STRICT("create_inode: failed to set time on " + "%s, because %s\n", pathname, +@@ -2235,6 +2238,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size) sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); + sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1) + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) EXIT_UNSQUASH("Failed to set signal mask in initialise_threads" "\n"); diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index 0edbd25..cea9caa 100644 +index 934618b..0e680ab 100644 --- a/squashfs-tools/unsquashfs.h +++ b/squashfs-tools/unsquashfs.h @@ -46,6 +46,10 @@ @@ -319,7 +242,7 @@ index 0edbd25..cea9caa 100644 #include <sys/time.h> +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif + #ifndef linux @@ -381,7 +304,7 @@ index c8e2b9b..7d4f7af 100644 } diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c -index 59f4aae..13f0e35 100644 +index 7742dfe..f8cd3b6 100644 --- a/squashfs-tools/unsquashfs_xattr.c +++ b/squashfs-tools/unsquashfs_xattr.c @@ -27,6 +27,11 @@ @@ -389,15 +312,15 @@ index 59f4aae..13f0e35 100644 #include <sys/xattr.h> +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define lsetxattr(path_, name_, val_, sz_, flags_) \ -+ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) ++ #define lsetxattr(path_, name_, val_, sz_, flags_) \ ++ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) +#endif + #define NOSPACE_MAX 10 extern int root_process; diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c -index b46550c..5b32eca 100644 +index 64dfd82..d82d186 100644 --- a/squashfs-tools/xattr.c +++ b/squashfs-tools/xattr.c @@ -22,6 +22,14 @@ @@ -420,12 +343,15 @@ index b46550c..5b32eca 100644 #include <sys/xattr.h> +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define llistxattr(path_, buf_, sz_) \ -+ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) -+ #define lgetxattr(path_, name_, val_, sz_) \ -+ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) ++ #define llistxattr(path_, buf_, sz_) \ ++ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) ++ #define lgetxattr(path_, name_, val_, sz_) \ ++ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) +#endif + #include "squashfs_fs.h" #include "squashfs_swap.h" #include "mksquashfs.h" +-- +2.23.0 + diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 5bd3b27eded..15a535eed3b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -8,26 +8,20 @@ assert lz4Support -> (lz4 != null); stdenv.mkDerivation { pname = "squashfs"; - version = "4.4dev_20180612"; + version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; - sha256 = "1y53z8dkph3khdyhkmkmy0sg9p1n8czv3vj4l324nj8kxyih3l2c"; - rev = "6e242dc95485ada8d1d0b3dd9346c5243d4a517f"; + sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; + # Tag "4.4" points to this commit. + rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ - # These patches ensures that mksquashfs output is reproducible. - # See also https://reproducible-builds.org/docs/system-images/ - # and https://github.com/NixOS/nixpkgs/issues/40144. - ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch - ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch - ./0003-remove-frag-deflator-thread.patch - # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. - ./squashfs-tools-4.4-4k-align.patch + ./4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index ea25b302e35..436037245bb 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ raskin matejc ]; platforms = lib.platforms.linux; license = lib.licenses.bsd3; + broken = true; # does not support openssl 1.1 }; } diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 1b578628caf..80b90e8e6b2 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,8 +1,8 @@ -{ buildGoModule, fetchFromGitHub, lib +{ buildGoPackage, fetchFromGitHub, lib , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm }: -buildGoModule rec { +buildGoPackage rec { pname = "wallutils"; version = "5.8.2"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh"; }; - modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah"; + goPackagePath = "github.com/xyproto/wallutils"; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index cb5ea25211c..6423a84badc 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { qtx11extras ]; + # Disable assertions which include -dev QtBase file paths. + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + configureFlags = [ "--without-python" ] ++ (if enableDbus then [ diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index efeb760e560..18e80ab6e4a 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "mirror://gnu/datamash/${pname}-${version}.tar.gz"; - sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 591cd5fe040..7b1e5ed6c0a 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "diskus"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "diskus"; rev = "v${version}"; - sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n"; + sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "13d4h6f3idwj2bxafqrjihgwwr8v3k158r7b569jp7q2v1msqqx1"; + cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp"; meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; @@ -21,5 +21,9 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.fuerbringer ]; platforms = platforms.unix; + longDescription = '' + diskus is a very simple program that computes the total size of the + current directory. It is a parallelized version of du -sh. + ''; }; } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 6fad9829d79..0fe9001fcdb 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }: stdenv.mkDerivation rec { version = "1.3"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--enable-geoip" + "--enable-geoip=mmdb" "--enable-utf8" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - geoipWithDatabase + libmaxminddb ncurses glib ]; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 0f448cc089c..52e712c5cb1 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd"; + sha256 = "14zr1aln34j5wifhg6ak3f83l959vic8i11jr90ibmnxl5v4hcqp"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index a8d571da7eb..e7d32dd4b37 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5"; + sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 9ee494e1f86..3d9111b6a61 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "lazydocker"; version = "0.7.4"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6"; }; - modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y"; + goPackagePath = "github.com/jesseduffield/lazydocker"; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index d0bf3521c7c..b518a159e91 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtm"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "deadpixi"; repo = pname; rev = version; - sha256 = "0q23z1dfjz3qkmxqm0d8sg81gn6w1j2n2j6c9hk1kk7iv21v1zb0"; + sha256 = "0k9xachd9wnyhj8sh4yninckgwm3a7zdxnn490x65ikn4vqb7w8x"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 613ad263ed3..90498767c99 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }: +{ lib, mkDerivation, fetchFromGitHub +, qtbase, qtcharts, qmake, libXrandr, libdrm +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "radeon-profile"; - version = "20170714"; + version = "20190903"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtcharts libXrandr libdrm ]; @@ -12,15 +14,15 @@ stdenv.mkDerivation rec { owner = "marazmista"; repo = "radeon-profile"; rev = version; - sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd"; + sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5"; }) + "/radeon-profile"; - postInstall = '' - mkdir -p $out/bin - cp ./radeon-profile $out/bin/radeon-profile + preConfigure = '' + substituteInPlace radeon-profile.pro \ + --replace "/usr/" "$out/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; homepage = https://github.com/marazmista/radeon-profile; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix new file mode 100644 index 00000000000..acfbd48c606 --- /dev/null +++ b/pkgs/tools/misc/shunit2/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "shunit2"; + version = "2019-08-10"; + + src = fetchFromGitHub { + owner = "kward"; + repo = "shunit2"; + rev = "ba130d69bbff304c0c6a9c5e8ab549ae140d6225"; + sha256 = "1bsn8dhxbjfmh01lq80yhnld3w3fw1flh7nwx12csrp58zsvlmgk"; + }; + + installPhase = '' + mkdir -p $out/bin/ + cp ./shunit2 $out/bin/shunit2 + chmod +x $out/bin/shunit2 + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/shunit2 + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kward/shunit2; + description = "A xUnit based unit test framework for Bourne based shell scripts."; + maintainers = with maintainers; [ cdepillabout utdemir ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5d571e0c022..8685bf7139e 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0vlpvacay25dzb5wix9jd91j0j1nrwz4k8zglj7210mhabfpnxvb"; + sha256 = "1xin821lgrdxb50i9p9ya3yfi64l4byf9il4jiijgsjckinxyflj"; }; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "0p16pa9psbj9126b4p61l0skmmasp2ms6c6r5rh3dfr8gg77qzpa"; + cargoSha256 = "12yswvhgcmqz0nyarva27pjc4xqqqn3m31y04r3l7ldbzgikn8k6"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 5b0ad830b19..59685aa721a 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: +{ stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick +, libyubikey, yubikey-personalization }: mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; @@ -8,12 +9,27 @@ mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake imagemagick ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' - mkdir -p $out/bin - cp build/release/yubikey-personalization-gui $out/bin + install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui" + install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1" + + # Desktop files + install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop" + install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/pixmaps/yubikey-personalization-gui.xpm" + + # Icons + install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png" + for SIZE in 16 24 32 48 64 96; do + # set modify/create for reproducible builds + convert -scale ''${SIZE} +set date:create +set date:modify \ + resources/lin/yubikey-personalization-gui.png \ + yubikey-personalization-gui.png + + install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 160b5840cf5..5ed2d5a1cb1 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "croc"; - version = "6.1.1"; + version = "6.1.3"; goPackagePath = "github.com/schollz/croc"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "08gkwllk3m5hpkr1iwabvs739rvl6rzdnra2v040dzdj6zgyd12r"; + sha256 = "1qc655y1vvz0bk4rk78fl33s3dqz196zn08aczrb4ipbbj7hp8x8"; }; - modSha256 = "026m3hc2imna7bf4jpqm7yq6mr4l5is2crsx1vxdpr4h0n6z0v3i"; + modSha256 = "00bnf4dc3i41s9wjpbc59nn7jwlhvp2zhdrjhjn5fwbc95pm4gm0"; subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index b256b5b37d9..58e698ed708 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0h4xpyd6phj3svjzxh6nd98ym81x4a2v6jxcnqj4psjinwd4p3md"; + sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; }; - - modSha256 = "1hsq2gfhscl4wvld346xrp018sb1g3xvga3d8chlbgw93rmhhszb"; + + modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 6395fcf09eb..4230762d946 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages, docutils, }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "httpie"; version = "1.0.3"; - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd"; + src = fetchFromGitHub { + owner = "jakubroztocil"; + repo = "httpie"; + rev = version; + sha256 = "0y30sp0x3nmgzi4dqw1rc3705hnn36ij0zlyyx7g6fqdq8bd8p5q"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests ]; + propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; + dontUseSetuptoolsCheck = true; - doCheck = false; + disabledTests = [ + "test_current_version" + "test_error" + ]; + + checkInputs = with python3Packages; [ + mock + pytest + pytest-httpbin + pytestCheckHook + ]; + + # the tests call rst2pseudoxml.py from docutils + preCheck = '' + export PATH=${docutils}/bin:$PATH + ''; meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index ab09399cd8e..d2dbd235e11 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0"; + sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch new file mode 100644 index 00000000000..51c9a706f89 --- /dev/null +++ b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch @@ -0,0 +1,34 @@ +From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001 +From: emanuele-f <faranda@ntop.org> +Date: Tue, 18 Sep 2018 12:49:57 +0200 +Subject: [PATCH] Compilation fix with new libpcap + +SOCKET and INVALID_SOCKET are now defined in pcap.h +--- + third-party/mongoose/mongoose.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c +index 6a61cea9b..634c142e3 100644 +--- a/third-party/mongoose/mongoose.c ++++ b/third-party/mongoose/mongoose.c +@@ -247,7 +247,9 @@ struct pollfd { + #define mg_rename(x, y) rename(x, y) + #define mg_sleep(x) usleep((x) * 1000) + #define ERRNO errno ++#ifndef INVALID_SOCKET + #define INVALID_SOCKET (-1) ++#endif + + /* ntop */ + #if ((ULONG_MAX) == (UINT_MAX)) +@@ -270,7 +272,9 @@ struct pollfd { + #endif + + //#define INT64_FMT PRId64 ++#ifndef SOCKET + typedef int SOCKET; ++#endif + #define WINCDECL + + #endif // End of Windows and UNIX specific includes diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index d745ba8d14d..0c693ac6288 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Undo-weird-modification-of-data_dir.patch ./0002-Remove-requirement-to-have-writeable-callback-dir.patch + ./0003-New-libpcap-defines-SOCKET.patch ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy @@ -62,6 +63,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; - broken = true; # broken since commit "libpcap: 1.8.1 -> 1.9.0" }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index b9a4360abfb..7f6aeace7b8 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,29 +1,54 @@ { monolithic ? true # build monolithic amule -, daemon ? false # build amule daemon +, enableDaemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui -, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, pkgconfig, makeWrapper, libX11 ? null }: +, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null +, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }: assert httpServer -> libpng != null; assert client -> libX11 != null; -with stdenv; -mkDerivation rec { - name = "aMule-2.3.2"; +stdenv.mkDerivation rec { + pname = "amule"; + version = "2.3.2"; - src = fetchurl { - url = "mirror://sourceforge/amule/${name}.tar.xz"; - sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn"; + src = fetchFromGitHub { + owner = "amule-project"; + repo = "amule"; + rev = version; + sha256 = "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn"; }; - buildInputs = - [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ] - ++ lib.optional httpServer libpng - ++ lib.optional client libX11; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/amule-project/amule/pull/135.patch"; + sha256 = "1n24r1j28083b8ipbnh1nf6i4j6vx59pdkfl1c0g6bb4psx9wvvi"; + name = "libupnp_18.patch"; + }) + ]; + + postPatch = '' + substituteInPlace src/libs/ec/file_generator.pl \ + --replace /usr/bin/perl ${perl}/bin/perl + + # autotools expects these to be in the root + cp docs/{AUTHORS,README} . + cp docs/Changelog ./ChangeLog + cp docs/Changelog ./NEWS + ''; + + preAutoreconf = '' + pushd src/pixmaps/flags_xpm >/dev/null + ./makeflags.sh + popd >/dev/null + ''; - # See: https://github.com/amule-project/amule/issues/126 - patches = [ ./upnp-1.8.patch ]; + nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ]; + + buildInputs = [ + zlib wxGTK perl cryptopp libupnp + ] ++ lib.optional httpServer libpng + ++ lib.optional client libX11; enableParallelBuilding = true; @@ -31,27 +56,21 @@ mkDerivation rec { "--with-crypto-prefix=${cryptopp}" "--disable-debug" "--enable-optimize" - (stdenv.lib.enableFeature monolithic "monolithic") - (stdenv.lib.enableFeature daemon "amule-daemon") - (stdenv.lib.enableFeature client "amule-gui") - (stdenv.lib.enableFeature httpServer "webserver") + (lib.enableFeature monolithic "monolithic") + (lib.enableFeature enableDaemon "amule-daemon") + (lib.enableFeature client "amule-gui") + (lib.enableFeature httpServer "webserver") ]; - postConfigure = '' - sed -i "src/libs/ec/file_generator.pl" \ - -es'|/usr/bin/perl|${perl}/bin/perl|g' - ''; - # aMule will try to `dlopen' libupnp and libixml, so help it # find them. postInstall = lib.optionalString monolithic '' - wrapProgram "$out/bin/amule" --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib" + wrapProgram $out/bin/amule \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libupnp ]} ''; - meta = { - homepage = http://amule.org/; + meta = with lib; { description = "Peer-to-peer client for the eD2K and Kademlia networks"; - longDescription = '' aMule is an eMule-like client for the eD2k and Kademlia networks, supporting multiple platforms. Currently aMule @@ -63,9 +82,9 @@ mkDerivation rec { applications. ''; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.phreedom ]; + homepage = "https://amule.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ phreedom ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch b/pkgs/tools/networking/p2p/amule/upnp-1.8.patch deleted file mode 100644 index 3f5502582a2..00000000000 --- a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch +++ /dev/null @@ -1,230 +0,0 @@ ---- a/src/UPnPBase.cpp -+++ b/src/UPnPBase.cpp -@@ -29,22 +29,12 @@ - - #ifdef ENABLE_UPNP - --// check for broken Debian-hacked libUPnP - #include <upnp.h> --#ifdef STRING_H // defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better. --#define BROKEN_DEBIAN_LIBUPNP --#endif - - #include "UPnPBase.h" - - #include <algorithm> // For transform() - --#ifdef BROKEN_DEBIAN_LIBUPNP -- #define GET_UPNP_STRING(a) UpnpString_get_String(a) --#else -- #define GET_UPNP_STRING(a) (a) --#endif -- - std::string stdEmptyString; - - const char s_argument[] = "argument"; -@@ -1127,7 +1117,7 @@ - - - // This function is static --int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/) -+int CUPnPControlPoint::Callback(Upnp_EventType EventType, const void *Event, void * /*Cookie*/) - { - std::ostringstream msg; - std::ostringstream msg2; -@@ -1149,24 +1139,24 @@ - msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: "; - // UPnP Discovery - upnpDiscovery: -- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event; -+ UpnpDiscovery *d_event = (UpnpDiscovery *)Event; - IXML_Document *doc = NULL; - int ret; -- if (d_event->ErrCode != UPNP_E_SUCCESS) { -- msg << UpnpGetErrorMessage(d_event->ErrCode) << "."; -+ if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) { -+ msg << UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)) << "."; - AddDebugLogLineC(logUPnP, msg); - } - // Get the XML tree device description in doc -- ret = UpnpDownloadXmlDoc(d_event->Location, &doc); -+ ret = UpnpDownloadXmlDoc(UpnpDiscovery_get_Location_cstr(d_event), &doc); - if (ret != UPNP_E_SUCCESS) { - msg << "Error retrieving device description from " << -- d_event->Location << ": " << -+ UpnpDiscovery_get_Location_cstr(d_event) << ": " << - UpnpGetErrorMessage(ret) << - "(" << ret << ")."; - AddDebugLogLineC(logUPnP, msg); - } else { - msg2 << "Retrieving device description from " << -- d_event->Location << "."; -+ UpnpDiscovery_get_Location_cstr(d_event) << "."; - AddDebugLogLineN(logUPnP, msg2); - } - if (doc) { -@@ -1195,7 +1185,7 @@ - } - // Add the root device to our list - upnpCP->AddRootDevice(rootDevice, urlBase, -- d_event->Location, d_event->Expires); -+ UpnpDiscovery_get_Location_cstr(d_event), UpnpDiscovery_get_Expires(d_event)); - } - // Free the XML doc tree - IXML::Document::Free(doc); -@@ -1216,28 +1206,28 @@ - case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: { - //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n"); - // UPnP Device Removed -- struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event; -- if (dab_event->ErrCode != UPNP_E_SUCCESS) { -+ UpnpDiscovery *dab_event = (UpnpDiscovery *)Event; -+ if (UpnpDiscovery_get_ErrCode(dab_event) != UPNP_E_SUCCESS) { - msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " << -- UpnpGetErrorMessage(dab_event->ErrCode) << -+ UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(dab_event)) << - "."; - AddDebugLogLineC(logUPnP, msg); - } -- std::string devType = dab_event->DeviceType; -+ std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event); - // Check for an InternetGatewayDevice and removes it from the list - std::transform(devType.begin(), devType.end(), devType.begin(), tolower); - if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) { -- upnpCP->RemoveRootDevice(dab_event->DeviceId); -+ upnpCP->RemoveRootDevice(UpnpDiscovery_get_DeviceID_cstr(dab_event)); - } - break; - } - case UPNP_EVENT_RECEIVED: { - //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n"); - // Event reveived -- struct Upnp_Event *e_event = (struct Upnp_Event *)Event; -- const std::string Sid = e_event->Sid; -+ UpnpEvent *e_event = (UpnpEvent *)Event; -+ const std::string Sid = UpnpEvent_get_SID_cstr(e_event); - // Parses the event -- upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables); -+ upnpCP->OnEventReceived(Sid, UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event)); - break; - } - case UPNP_EVENT_SUBSCRIBE_COMPLETE: -@@ -1252,16 +1242,15 @@ - //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n"); - msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): "; - upnpEventRenewalComplete: -- struct Upnp_Event_Subscribe *es_event = -- (struct Upnp_Event_Subscribe *)Event; -- if (es_event->ErrCode != UPNP_E_SUCCESS) { -+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; -+ if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) { - msg << "Error in Event Subscribe Callback"; - UPnP::ProcessErrorMessage( -- msg.str(), es_event->ErrCode, NULL, NULL); -+ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL); - } else { - #if 0 - TvCtrlPointHandleSubscribeUpdate( -- GET_UPNP_STRING(es_event->PublisherUrl), -+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event), - es_event->Sid, - es_event->TimeOut ); - #endif -@@ -1280,29 +1269,29 @@ - msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): "; - msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: "; - upnpEventSubscriptionExpired: -- struct Upnp_Event_Subscribe *es_event = -- (struct Upnp_Event_Subscribe *)Event; -+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; - Upnp_SID newSID; - memset(newSID, 0, sizeof(Upnp_SID)); - int TimeOut = 1801; - int ret = UpnpSubscribe( - upnpCP->m_UPnPClientHandle, -- GET_UPNP_STRING(es_event->PublisherUrl), -+ -+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event), - &TimeOut, - newSID); - if (ret != UPNP_E_SUCCESS) { - msg << "Error Subscribing to EventURL"; - UPnP::ProcessErrorMessage( -- msg.str(), es_event->ErrCode, NULL, NULL); -+ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL); - } else { - ServiceMap::iterator it = -- upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl)); -+ upnpCP->m_ServiceMap.find(UpnpEventSubscribe_get_PublisherUrl_cstr(es_event)); - if (it != upnpCP->m_ServiceMap.end()) { - CUPnPService &service = *(it->second); - service.SetTimeout(TimeOut); - service.SetSID(newSID); - msg2 << "Re-subscribed to EventURL '" << -- GET_UPNP_STRING(es_event->PublisherUrl) << -+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event) << - "' with SID == '" << - newSID << "'."; - AddDebugLogLineC(logUPnP, msg2); -@@ -1321,17 +1310,16 @@ - case UPNP_CONTROL_ACTION_COMPLETE: { - //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n"); - // This is here if we choose to do this asynchronously -- struct Upnp_Action_Complete *a_event = -- (struct Upnp_Action_Complete *)Event; -- if (a_event->ErrCode != UPNP_E_SUCCESS) { -+ UpnpActionComplete *a_event = (UpnpActionComplete *)Event; -+ if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) { - UPnP::ProcessErrorMessage( - "UpnpSendActionAsync", -- a_event->ErrCode, NULL, -- a_event->ActionResult); -+ UpnpActionComplete_get_ErrCode(a_event), NULL, -+ UpnpActionComplete_get_ActionResult(a_event)); - } else { - // Check the response document - UPnP::ProcessActionResponse( -- a_event->ActionResult, -+ UpnpActionComplete_get_ActionResult(a_event), - "<UpnpSendActionAsync>"); - } - /* No need for any processing here, just print out results. -@@ -1342,12 +1330,11 @@ - case UPNP_CONTROL_GET_VAR_COMPLETE: { - //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n"); - msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): "; -- struct Upnp_State_Var_Complete *sv_event = -- (struct Upnp_State_Var_Complete *)Event; -- if (sv_event->ErrCode != UPNP_E_SUCCESS) { -+ UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event; -+ if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) { - msg << "m_UpnpGetServiceVarStatusAsync"; - UPnP::ProcessErrorMessage( -- msg.str(), sv_event->ErrCode, NULL, NULL); -+ msg.str(), UpnpStateVarComplete_get_ErrCode(sv_event), NULL, NULL); - } else { - #if 0 - // Warning: The use of UpnpGetServiceVarStatus and ---- a/src/UPnPBase.h -+++ b/src/UPnPBase.h -@@ -490,9 +490,19 @@ - // Callback function - static int Callback( - Upnp_EventType EventType, -- void* Event, -+ const void* Event, - void* Cookie); - -+#if UPNP_VERSION < 10800 -+ /* in libupnp 1.6 Event is not const */ -+ static int Callback( -+ Upnp_EventType EventType, -+ void* Event, -+ void* Cookie) { -+ return Callback(EventType, (const void *)Event, Cookie); -+ } -+#endif -+ - private: - void OnEventReceived( - const std::string &Sid,
\ No newline at end of file diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 7c883ebdc55..e6d427b2bcb 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -8,22 +8,22 @@ let url = "https://github.com/datawire/sshuttle.git"; rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3"; - leaveDotGit = true; }; - buildInputs = p.buildInputs ++ [ git ]; + nativeBuildInputs = p.nativeBuildInputs ++ [ git ]; + postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.93"; + version = "0.101"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d"; + sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 0251e6acf81..eb3977e84e6 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.10.5"; + version = "0.12.4"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; - rev = version; - sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; + rev = "v${version}"; + sha256 = "02rx25dd3klprwr1qmn5vn4vz4244amk2ky4nqfmi4vq3ygrhd1c"; }; - cargoSha256 = "1l1rvd3i3d7jn3crwc194i5qm3f0jaw7ksb4bvqn3v8rf44chmrs"; + cargoSha256 = "18nbmq8j58jlka1lsrx2y0bhb9l5f3wyvcr1zmmda3hvc3vm7kla"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c038249b69f..518c1baad5a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -121,7 +121,7 @@ common = homepage = https://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; @@ -201,12 +201,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20190913_a25c022"; + suffix = "pre20190922_382aa05"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a25c022af3fa0a35be406942869edae1bdff2cf8"; - hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg="; + rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf"; + hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g="; }; fromGit = true; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 2683192c89e..24301fc76d8 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4"; + sha256 = "1nkhp1mnvah7zkc1s55jji9lxxbph1miw8dfl9kb72khmaqfzsf0"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 249ff435c5f..527c8064bac 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.1.5"; + version = "0.4.1.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58"; + sha256 = "0wgdid8w7srd218hh4rwslzdx2ickxw1pg18p2wry1r6wi65521a"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7620fc9760d..4d47e5d4134 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -buildGoModule rec { +buildGoPackage rec { pname = "vault"; version = "1.2.3"; @@ -11,7 +11,9 @@ buildGoModule rec { sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8"; }; - modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; + goPackagePath = "github.com/hashicorp/vault"; + + subPackages = [ "." ]; buildFlagsArray = [ "-tags='vault'" @@ -19,8 +21,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + mkdir -p $bin/share/bash-completion/completions + echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix new file mode 100644 index 00000000000..9bc6ecc6ddf --- /dev/null +++ b/pkgs/tools/system/daemon/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation { + name = "daemon-0.6.4"; + src = fetchurl { + url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; + }; + makeFlags = "PREFIX=$(out)"; + buildInputs = [ perl ]; + + meta = { + description = "Daemon turns other process into daemons"; + longDescription = '' + Daemon turns other process into daemons. There are many tasks that need + to be performed to correctly set up a daemon process. This can be tedious. + Daemon performs these tasks for other processes. This is useful for + writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh, + Java). + ''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 77f6632ff53..f5c447ea0a5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -22,7 +22,7 @@ plan9portLinkFlags() configurePhase() { ( - echo CC9=\"$(which $CC)\" + echo CC9=\"$(command -v $CC)\" echo CFLAGS=\"$NIX_CFLAGS_COMPILE\" echo LDFLAGS=\"$(plan9portLinkFlags)\" echo X11=\"${libXt_dev}/include\" diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 0a2b7ab4f3b..3f23624071f 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule { +buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; version = "20190702"; @@ -8,10 +8,11 @@ buildGoModule { rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; + sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv"; + fetchSubmodules = true; }; - modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; + goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index b2b94e1d9d9..0bf8a7e85dc 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { patches = [ ./dont_static_link.patch ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' + ''; + preBuild = '' patchShebangs scripts ''; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index d271490ca1c..1fc462bad8b 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.5.0"; + version = "5.6.2"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz"; + sha256 = "1xajaab02y9bysanfn4i5c77q1zfmjzdswyvw2mzbidsxnjsgn6l"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index b73015dd19f..308f893e73b 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "vale"; version = "1.7.1"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m"; }; - modSha256 = "0av728w22rrlw2030d09q5dz9ks58p3n4g1hx4xcs0gi33sdsdb8"; + goPackagePath = "github.com/errata-ai/vale"; meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 69fde7784f5..6622a03decc 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -136,9 +136,9 @@ in buildEnv { script = writeText "hyphens.sed" ( # pick up the header - "1,/^\% from/p;" + "1,/^% from/p;" # pick up all sections matching packages that we combine - + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames + + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames ); in '' ( diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d2d438cf099..3d4a77100d4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -217,6 +217,9 @@ mapAliases ({ mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 module_init_tools = kmod; # added 2016-04-22 + mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream."; + mozart = mozart2-binary; # added 2019-09-23 + mozart-binary = mozart2-binary; # added 2019-09-23 mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 @@ -291,8 +294,6 @@ mapAliases ({ pyo3-pack = maturin; pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - qt_gstreamer = qt-gstreamer; # added 2017-02 - qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 @@ -390,6 +391,7 @@ mapAliases ({ winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xfceUnstable = xfce4-14; # added 2019-09-17 x11 = xlibsWrapper; # added 2015-09 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 @@ -426,7 +428,7 @@ mapAliases ({ ocamlPackages_latest; gst_all = { # added 2018-04-25 - inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer; + inherit (pkgs) gstreamer gnonlin gst-python; gstPluginsBase = pkgs.gst-plugins-base; gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsGood = pkgs.gst-plugins-good; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79c6017df63..336408961b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -576,7 +576,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - ammonite = callPackage ../development/tools/ammonite {}; + inherit (callPackages ../development/tools/ammonite {}) + ammonite_2_12 + ammonite_2_13; + ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; amp = callPackage ../applications/editors/amp {}; @@ -713,7 +716,7 @@ in amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; - daemon = true; + enableDaemon = true; }); amuleGui = appendToName "gui" (amule.override { @@ -2517,6 +2520,8 @@ in dadadodo = callPackage ../tools/text/dadadodo { }; + daemon = callPackage ../tools/system/daemon { }; + daemonize = callPackage ../tools/system/daemonize { }; daq = callPackage ../applications/networking/ids/daq { }; @@ -4222,6 +4227,8 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; + lefthook = gitAndTools.lefthook; + lego = callPackage ../tools/admin/lego { }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4402,6 +4409,10 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + next = callPackage ../applications/networking/browsers/next { }; + + next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { }; + nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -6070,6 +6081,8 @@ in shrikhand = callPackage ../data/fonts/shrikhand { }; + shunit2 = callPackage ../tools/misc/shunit2 { }; + sic = callPackage ../applications/networking/irc/sic { }; siege = callPackage ../tools/networking/siege {}; @@ -7275,6 +7288,8 @@ in ksh = callPackage ../shells/ksh { }; + liquidprompt = callPackage ../shells/liquidprompt { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -8227,8 +8242,9 @@ in mosml = callPackage ../development/compilers/mosml { }; - mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; - mozart = mozart-binary; + mozart2 = callPackage ../development/compilers/mozart { }; + + mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; nim = callPackage ../development/compilers/nim { }; nrpl = callPackage ../development/tools/nrpl { }; @@ -8308,7 +8324,6 @@ in buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; cratesIO = callPackage ../build-support/rust/crates-io.nix { }; - cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -8339,7 +8354,9 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { }; + cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9140,6 +9157,8 @@ in awf = callPackage ../development/tools/misc/awf { }; + aws-adfs = with python3Packages; toPythonApplication aws-adfs; + electron_6 = callPackage ../development/tools/electron/6.x.nix { }; electron_5 = callPackage ../development/tools/electron/5.x.nix { }; @@ -9211,6 +9230,8 @@ in bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + bingrep = callPackage ../development/tools/analysis/bingrep { }; + binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; @@ -11080,9 +11101,6 @@ in qt-mobility = callPackage ../development/libraries/qt-mobility {}; - qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - - qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; }; qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; @@ -11319,6 +11337,8 @@ in hydra = callPackage ../development/tools/misc/hydra { }; + hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; + hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hyena = callPackage ../development/libraries/hyena { }; @@ -12680,6 +12700,8 @@ in microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; + minizip = callPackage ../development/libraries/minizip { }; mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; @@ -12692,8 +12714,6 @@ in mono-addins = callPackage ../development/libraries/mono-addins { }; - mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; - movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -12847,6 +12867,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; + oneko = callPackage ../applications/misc/oneko { }; oniguruma = callPackage ../development/libraries/oniguruma { }; @@ -12965,6 +12987,8 @@ in osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; + osmid = callPackage ../applications/audio/osmid {}; + osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; @@ -14719,6 +14743,8 @@ in meteor = callPackage ../servers/meteor { }; + micronaut = callPackage ../development/tools/micronaut {}; + minio = callPackage ../servers/minio { }; # Backwards compatibility. @@ -14941,6 +14967,8 @@ in check-nwc-health check-ups-health; + check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { }; + checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; neo4j = callPackage ../servers/nosql/neo4j { }; @@ -14993,15 +15021,16 @@ in postgresql_10 postgresql_11 ; - postgresql = postgresql_9_6.override { this = postgresql; }; + postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; + postgresql11Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; @@ -16589,6 +16618,8 @@ in carlito = callPackage ../data/fonts/carlito {}; + cascadia-code = callPackage ../data/fonts/cascadia-code { }; + charis-sil = callPackage ../data/fonts/charis-sil { }; cherry = callPackage ../data/fonts/cherry { }; @@ -16953,6 +16984,8 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; @@ -17204,6 +17237,8 @@ in yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; + yaru-theme = callPackage ../data/themes/yaru {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { }; zeal = libsForQt5.callPackage ../data/documentation/zeal { }; @@ -18274,7 +18309,6 @@ in libpng = libpng_apng; python = python2; gnused = gnused_422; - icu = icu63; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; @@ -18716,7 +18750,7 @@ in spotifyd = callPackage ../applications/audio/spotifyd { withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or true; + withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; }; @@ -19116,7 +19150,7 @@ in libowfat = callPackage ../development/libraries/libowfat { }; - librecad = callPackage ../applications/misc/librecad { }; + librecad = libsForQt5.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -19688,6 +19722,8 @@ in pdfdiff = callPackage ../applications/misc/pdfdiff { }; + pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; + mupdf = callPackage ../applications/misc/mupdf { }; mystem = callPackage ../applications/misc/mystem { }; @@ -19974,6 +20010,8 @@ in purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; + purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; + purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; @@ -20161,7 +20199,7 @@ in quasselDaemon = quassel.override { monolithic = false; - daemon = true; + enableDaemon = true; withKDE = false; tag = "-daemon-qt5"; }; @@ -22055,9 +22093,8 @@ in hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = callPackage ../games/hedgewars { + hedgewars = libsForQt5.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; - ffmpeg = ffmpeg_2; }; hexen = callPackage ../games/hexen { }; @@ -22708,7 +22745,6 @@ in solarc-gtk-theme = callPackage ../misc/themes/solarc { }; xfce = xfce4-12; - xfceUnstable = xfce4-14; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); @@ -23492,7 +23528,7 @@ in netlogo = callPackage ../applications/science/misc/netlogo { }; - ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; + ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; root = callPackage ../applications/science/misc/root { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49bfc58adf0..be7c0bc4171 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,6 +1,4 @@ -{ buildPackages, pkgs -, newScope -}: +{ buildPackages, pkgs, newScope }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -47,24 +45,12 @@ in { ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { }; - ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_39; - llvmPackages = pkgs.llvmPackages_39; - }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; sphinx = buildPackages.python3Packages.sphinx_1_7_9; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -91,7 +77,7 @@ in { ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc864; + bootPkgs = packages.ghc865; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; @@ -126,21 +112,11 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc822 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc822; - ghc = bh.compiler.ghc822; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - }; ghc844 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc844; ghc = bh.compiler.ghc844; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; - ghc864 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc864; - ghc = bh.compiler.ghc864; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 728f6f7712d..23c0643f1c4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -304,6 +304,8 @@ let iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; + iter = callPackage ../development/ocaml-modules/iter { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib; }; @@ -621,8 +623,6 @@ let seq = callPackage ../development/ocaml-modules/seq { }; - sequence = callPackage ../development/ocaml-modules/sequence { }; - spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; @@ -664,6 +664,8 @@ let then sexplib_108_08_00 else null; + ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; + ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; @@ -696,6 +698,8 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bc54ebef67..654f1c50f40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -721,7 +721,7 @@ in { mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { }); mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; @@ -821,7 +821,7 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; - perf = callPackage ../development/python-modules/perf { }; + pyperf = callPackage ../development/python-modules/pyperf { }; perfplot = callPackage ../development/python-modules/perfplot { }; @@ -1052,6 +1052,8 @@ in { pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-check = callPackage ../development/python-modules/pytest-check { }; + pytest-env = callPackage ../development/python-modules/pytest-env { }; pytest-flask = callPackage ../development/python-modules/pytest-flask { }; @@ -1277,6 +1279,8 @@ in { addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + altair = callPackage ../development/python-modules/altair { }; vega = callPackage ../development/python-modules/vega { }; @@ -2143,9 +2147,9 @@ in { libais = callPackage ../development/python-modules/libais { }; - libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override { - python2 = python; - })); + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + }); libtmux = callPackage ../development/python-modules/libtmux { }; @@ -3111,8 +3115,6 @@ in { flask_migrate = callPackage ../development/python-modules/flask-migrate { }; - flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; - flask-paginate = callPackage ../development/python-modules/flask-paginate { }; flask_principal = callPackage ../development/python-modules/flask-principal { }; @@ -4199,6 +4201,8 @@ in { pickleshare = callPackage ../development/python-modules/pickleshare { }; + picos = callPackage ../development/python-modules/picos { }; + piep = callPackage ../development/python-modules/piep { }; piexif = callPackage ../development/python-modules/piexif { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index da81a696337..f832268899d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -62,7 +62,7 @@ let jobs.vim.x86_64-darwin # UI apps - jobs.firefox-unwrapped.x86_64-darwin + # jobs.firefox-unwrapped.x86_64-darwin jobs.qt5.qtmultimedia.x86_64-darwin jobs.inkscape.x86_64-darwin jobs.gimp.x86_64-darwin |