diff options
565 files changed, 12584 insertions, 11045 deletions
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d832716c03082..48d22831cd9b0 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -953,7 +953,7 @@ is essentially a "free software" license (BSD3), according to paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! To work around these problems GHC can be build with a slower but LGPL-free -alternative implemention for Integer called +alternative implementation for Integer called [integer-simple](http://hackage.haskell.org/package/integer-simple). To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use diff --git a/doc/manual.xml b/doc/manual.xml index f31897aed039a..ab845e1a10866 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,12 +1,13 @@ <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"> <info> - <title>Nixpkgs Contributors Guide</title> + <title>Nixpkgs Users and Contributors Guide</title> <subtitle>Version <xi:include href=".version" parse="text" /> </subtitle> </info> <xi:include href="introduction.chapter.xml" /> <xi:include href="quick-start.xml" /> + <xi:include href="package-specific-user-notes.xml" /> <xi:include href="stdenv.xml" /> <xi:include href="multiple-output.xml" /> <xi:include href="cross-compilation.xml" /> diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 12d81ae29bffd..29b6b2420b5ba 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -352,312 +352,6 @@ packageOverrides = pkgs: { </screen> </para> </section> - <section xml:id="sec-steam"> - <title>Steam</title> - - <section xml:id="sec-steam-nix"> - <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. - </para> - - <para> - Nix problems and constraints: - <itemizedlist> - <listitem> - <para> - We don't have <filename>/bin/bash</filename> and many scripts point - there. Similarly for <filename>/usr/bin/python</filename> . - </para> - </listitem> - <listitem> - <para> - We don't have the dynamic loader in <filename>/lib </filename>. - </para> - </listitem> - <listitem> - <para> - The <filename>steam.sh</filename> script in $HOME can not be patched, as - it is checked and rewritten by steam. - </para> - </listitem> - <listitem> - <para> - The steam binary cannot be patched, it's also checked. - </para> - </listitem> - </itemizedlist> - </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. - </para> - </section> - - <section xml:id="sec-steam-play"> - <title>How to play</title> - - <para> - For 64-bit systems it's important to have -<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 -<programlisting>hardware.steam-hardware.enable = true;</programlisting> - to your configuration. - </para> - </section> - - <section xml:id="sec-steam-troub"> - <title>Troubleshooting</title> - - <para> - <variablelist> - <varlistentry> - <term> - Steam fails to start. What do I do? - </term> - <listitem> - <para> - Try to run -<programlisting>strace steam</programlisting> - to see what is causing steam to fail. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Using the FOSS Radeon or nouveau (nvidia) drivers - </term> - <listitem> - <itemizedlist> - <listitem> - <para> - 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 -<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>. - </para> - </listitem> - </itemizedlist> - </listitem> - </varlistentry> - <varlistentry> - <term> - Java - </term> - <listitem> - <orderedlist> - <listitem> - <para> - 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> - to your configuration. - </para> - </listitem> - </orderedlist> - </listitem> - </varlistentry> - </variablelist> - </para> - </section> - - <section xml:id="sec-steam-run"> - <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 -<programlisting>pkgs.(steam.override { - nativeOnly = true; - newStdcpp = true; - }).run</programlisting> - to your configuration, rebuild, and run the game with -<programlisting>steam-run ./foo</programlisting> - </para> - </section> - </section> - <section xml:id="sec-emacs"> - <title>Emacs</title> - - <section xml:id="sec-emacs-config"> - <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: - </para> - -<screen> -{ - packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - } -} -</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. - </para> - -<screen> -{ - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' -;; initialize package - -(require 'package) -(package-initialize 'noactivate) -(eval-when-compile - (require 'use-package)) - -;; load some packages - -(use-package company - :bind ("<C-tab>" . company-complete) - :diminish company-mode - :commands (company-mode global-company-mode) - :defer 1 - :config - (global-company-mode)) - -(use-package counsel - :commands (counsel-descbinds) - :bind (([remap execute-extended-command] . counsel-M-x) - ("C-x C-f" . counsel-find-file) - ("C-c g" . counsel-git) - ("C-c j" . counsel-git-grep) - ("C-c k" . counsel-ag) - ("C-x l" . counsel-locate) - ("M-y" . counsel-yank-pop))) - -(use-package flycheck - :defer 2 - :config (global-flycheck-mode)) - -(use-package ivy - :defer 1 - :bind (("C-c C-r" . ivy-resume) - ("C-x C-b" . ivy-switch-buffer) - :map ivy-minibuffer-map - ("C-j" . ivy-call)) - :diminish ivy-mode - :commands ivy-mode - :config - (ivy-mode 1)) - -(use-package magit - :defer - :if (executable-find "git") - :bind (("C-x g" . magit-status) - ("C-x G" . magit-dispatch-popup)) - :init - (setq magit-completing-read-function 'ivy-completing-read)) - -(use-package projectile - :commands projectile-mode - :bind-keymap ("C-c p" . projectile-command-map) - :defer 5 - :config - (projectile-global-mode)) - ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' -mkdir -p $out/share/emacs/site-lisp -cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el -'') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; -} -</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. - </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>. - </para> - -<screen> -overrides = self: super: rec { - haskell-mode = self.melpaPackages.haskell-mode; - ... -}; -((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ - # here both these package will use haskell-mode of our own choice - ghc-mod - dante -]) -</screen> - </section> - </section> <section xml:id="sec-weechat"> <title>Weechat</title> @@ -762,64 +456,6 @@ stdenv.mkDerivation { }</programlisting> </para> </section> - <section xml:id="sec-citrix"> - <title>Citrix Receiver</title> - - <para> - The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix - Receiver</link> is a remote desktop viewer which provides 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 licenses - agreements of the vendor need to be accepted first. This is available at - the - <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download - page at citrix.com</link>. Then run <literal>nix-prefetch-url - file://$PWD/linuxx64-$version.tar.gz</literal>. With the archive available - in the store the package can be built and installed with Nix. - </para> - - <para> - <emphasis>Note: it's recommended to install <literal>Citrix - Receiver</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.</emphasis> - </para> - </section> - - <section xml:id="sec-citrix-custom-certs"> - <title>Custom certificates</title> - - <para> - The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts - 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 -citrix_receiver.override { - inherit extraCerts; -}]]> -</programlisting> - </para> - </section> - </section> <section xml:id="sec-ibus-typing-booster"> <title>ibus-engines.typing-booster</title> @@ -858,7 +494,7 @@ citrix_receiver.override { <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>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: @@ -891,30 +527,51 @@ citrix_receiver.override { </para> </section> </section> - <section xml:id="dlib"> - <title>DLib</title> + <section xml:id="sec-nginx"> + <title>Nginx</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="https://nginx.org/">Nginx</link> is a + reverse proxy and lightweight webserver. </para> - <section xml:id="compiling-without-avx-support"> - <title>Compiling without AVX support</title> + <section xml:id="sec-nginx-etag"> + <title>ETags on static files served from the Nix store</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. + 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> - 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> + 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. </para> </section> </section> diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml new file mode 100644 index 0000000000000..ef9198d1de299 --- /dev/null +++ b/doc/package-specific-user-notes.xml @@ -0,0 +1,469 @@ +<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>. + + </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. + </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. + </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. + </para> + </section> + + <section xml:id="sec-emacs"> + <title>Emacs</title> + + <section xml:id="sec-emacs-config"> + <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: + </para> + +<screen> +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} +</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. + </para> + +<screen> +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} +</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. + </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>. + </para> + +<screen> +overrides = self: super: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) +</screen> + </section> + </section> + + <section xml:id="dlib"> + <title>DLib</title> + + <para> + <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. + </para> + + <para> + 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> + </para> + </section> + </section> + + <section xml:id="unfree-software"> + <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. + </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. + </para> + </section> + + <section xml:id="sec-steam"> + <title>Steam</title> + + <section xml:id="sec-steam-nix"> + <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. + </para> + + <para> + Nix problems and constraints: + <itemizedlist> + <listitem> + <para> + We don't have <filename>/bin/bash</filename> and many scripts point + there. Similarly for <filename>/usr/bin/python</filename> . + </para> + </listitem> + <listitem> + <para> + We don't have the dynamic loader in <filename>/lib </filename>. + </para> + </listitem> + <listitem> + <para> + The <filename>steam.sh</filename> script in $HOME can not be patched, as + it is checked and rewritten by steam. + </para> + </listitem> + <listitem> + <para> + The steam binary cannot be patched, it's also checked. + </para> + </listitem> + </itemizedlist> + </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. + </para> + </section> + + <section xml:id="sec-steam-play"> + <title>How to play</title> + + <para> + For 64-bit systems it's important to have +<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 +<programlisting>hardware.steam-hardware.enable = true;</programlisting> + to your configuration. + </para> + </section> + + <section xml:id="sec-steam-troub"> + <title>Troubleshooting</title> + + <para> + <variablelist> + <varlistentry> + <term> + Steam fails to start. What do I do? + </term> + <listitem> + <para> + Try to run +<programlisting>strace steam</programlisting> + to see what is causing steam to fail. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Using the FOSS Radeon or nouveau (nvidia) drivers + </term> + <listitem> + <itemizedlist> + <listitem> + <para> + 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 +<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>. + </para> + </listitem> + </itemizedlist> + </listitem> + </varlistentry> + <varlistentry> + <term> + Java + </term> + <listitem> + <orderedlist> + <listitem> + <para> + 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> + to your configuration. + </para> + </listitem> + </orderedlist> + </listitem> + </varlistentry> + </variablelist> + </para> + </section> + + <section xml:id="sec-steam-run"> + <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 +<programlisting>pkgs.(steam.override { + nativeOnly = true; + newStdcpp = true; + }).run</programlisting> + to your configuration, rebuild, and run the game with +<programlisting>steam-run ./foo</programlisting> + </para> + </section> + </section> + + <section xml:id="sec-citrix"> + <title>Citrix Receiver</title> + + <para> + The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix + Receiver</link> is a remote desktop viewer which provides 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 need to be accepted first. This is available at + the + <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download + page at citrix.com</link>. Then run <literal>nix-prefetch-url + file://$PWD/linuxx64-$version.tar.gz</literal>. With the archive available + in the store the package can be built and installed with Nix. + </para> + + <para> + <emphasis>Note: it's recommended to install <literal>Citrix + Receiver</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.</emphasis> + </para> + </section> + + <section xml:id="sec-citrix-custom-certs"> + <title>Custom certificates</title> + + <para> + The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts + 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 +citrix_receiver.override { + inherit extraCerts; +}]]> +</programlisting> + </para> + </section> + </section> +</chapter> diff --git a/lib/generators.nix b/lib/generators.nix index 863ba847423ee..a71654bec6c36 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -178,7 +178,7 @@ rec { toPlist = {}: v: let isFloat = builtins.isFloat or (x: false); expr = ind: x: with builtins; - if isNull x then "" else + if x == null then "" else if isBool x then bool ind x else if isInt x then int ind x else if isString x then str ind x else diff --git a/lib/sources.nix b/lib/sources.nix index f02ddad17c6d7..0ffadea8f1bcf 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -83,7 +83,7 @@ rec { # Sometimes git stores the commitId directly in the file but # sometimes it stores something like: «ref: refs/heads/branch-name» matchRef = match "^ref: (.*)$" fileContent; - in if isNull matchRef + in if matchRef == null then fileContent else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the @@ -92,7 +92,7 @@ rec { then let fileContent = readFile packedRefsName; matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent; - in if isNull matchRef + in if matchRef == null then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); diff --git a/lib/trivial.nix b/lib/trivial.nix index 2d682961035f9..f2710a6f0338d 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -112,7 +112,7 @@ rec { # Function to call f: # Argument to check for null before passing it to `f` - a: if isNull a then a else f a; + a: if a == null then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14f43ede2f666..dc57313c87804 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -375,6 +375,11 @@ github = "ankhers"; name = "Justin Wood"; }; + anpryl = { + email = "anpryl@gmail.com"; + github = "anpryl"; + name = "Anatolii Prylutskyi"; + }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; @@ -881,6 +886,11 @@ github = "ceedubs"; name = "Cody Allen"; }; + cf6b88f = { + email = "elmo.todurov@eesti.ee"; + github = "cf6b88f"; + name = "Elmo Todurov"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -1359,9 +1369,13 @@ name = "David Sferruzza"; }; dtzWill = { - email = "nix@wdtz.org"; + email = "w@wdtz.org"; github = "dtzWill"; name = "Will Dietz"; + keys = [{ + longkeyid = "rsa4096/0xFD42C7D0D41494C8"; + fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; + }]; }; dxf = { email = "dingxiangfei2009@gmail.com"; @@ -1742,13 +1756,13 @@ github = "fps"; name = "Florian Paul Schmidt"; }; - + fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; name = "Michael Gough"; }; - + fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; @@ -2482,6 +2496,11 @@ github = "jtojnar"; name = "Jan Tojnar"; }; + juaningan = { + email = "juaningan@gmail.com"; + github = "juaningan"; + name = "Juan Rodal"; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; @@ -4001,6 +4020,11 @@ github = "Ptival"; name = "Valentin Robert"; }; + ptrhlm = { + email = "ptrhlm0@gmail.com"; + github = "ptrhlm"; + name = "Piotr Halama"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; @@ -4368,6 +4392,11 @@ github = "samdroid-apps"; name = "Sam Parkinson"; }; + samrose = { + email = "samuel.rose@gmail.com"; + github = "samrose"; + name = "Sam Rose"; + }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; @@ -4388,6 +4417,11 @@ github = "sargon"; name = "Daniel Ehlers"; }; + saschagrunert = { + email = "mail@saschagrunert.de"; + github = "saschagrunert"; + name = "Sascha Grunert"; + }; sauyon = { email = "s@uyon.co"; github = "sauyon"; @@ -4491,6 +4525,11 @@ github = "sfrijters"; name = "Stefan Frijters"; }; + sgraf = { + email = "sgraf1337@gmail.com"; + github = "sgraf812"; + name = "Sebastian Graf"; + }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index e9c6cd7e9acbb..8ff1681d3b4a9 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-19.03"> - <title>Release 19.03 (“Koiâ€, 2019/03/??)</title> + <title>Release 19.03 (“Koiâ€, 2019/04/11)</title> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -20,6 +20,11 @@ <itemizedlist> <listitem> <para> + End of support is planned for end of October 2019, handing over to 19.09. + </para> + </listitem> + <listitem> + <para> The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6. </para> diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index ead8f3abd8b2b..60b4a3bc17b64 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -19,7 +19,9 @@ <itemizedlist> <listitem> - <para /> + <para> + End of support is planned for end of April 2020, handing over to 20.03. + </para> </listitem> </itemizedlist> </section> @@ -154,6 +156,12 @@ </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> + which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 242c2a4dd442f..a67a0ab960e59 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -145,7 +145,7 @@ let displayOptionsGraph = let checkList = - if !(isNull testOption) then [ testOption ] + if testOption != null then [ testOption ] else testOptions; checkAll = checkList == []; in diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 2c18244621afa..04fa8b9559a9a 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -31,7 +31,7 @@ let # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index d79c43c0b5b98..724158f738219 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -46,7 +46,7 @@ let cfg = config.fonts.fontconfig; # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 74bff602a4771..0c6a7e2431aa6 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -8,7 +8,7 @@ let name = "sysctl option value"; check = val: let - checkType = x: isBool x || isString x || isInt x || isNull x; + checkType = x: isBool x || isString x || isInt x || x == null; in checkType val || (val._type or "" == "override" && checkType val.content); merge = loc: defs: mergeOneOption loc (filterOverrides defs); diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index c79be810eefd4..534fcc34276b4 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -63,8 +63,7 @@ in { b43Firmware_5_1_138 b43Firmware_6_30_163_46 b43FirmwareCutter - facetimehd-firmware - ]; + ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; }) ]; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index fd780be20825d..d5c92cfc1d9e4 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -198,7 +198,7 @@ let fi ${ # When there is a theme configured, use it, otherwise use the background image. - if (!isNull config.isoImage.grubTheme) then '' + if config.isoImage.grubTheme != null then '' # Sets theme. set theme=(hd0)/EFI/boot/grub-theme/theme.txt # Load theme fonts @@ -622,7 +622,7 @@ in { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (!isNull config.isoImage.grubTheme) [ + ] ++ optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 00c4d5018bf56..59eb4a63af405 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -36,7 +36,7 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - path = [ pkgs.btrfs-progs ]; + path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; inherit (config.system.nixos) release; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5198bedc1387e..5b7fa5d2b98ff 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -265,7 +265,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # DynamicUser = true # emby = 242; # unusued, removed 2019-05-01 graylog = 243; sniproxy = 244; @@ -567,7 +567,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # unused # emby = 242; # unused, removed 2019-05-01 sniproxy = 244; nzbget = 245; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a66747f038448..bc8bcc0cd8f67 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -536,6 +536,7 @@ ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix ./services/networking/bind.nix + ./services/networking/bitcoind.nix ./services/networking/autossh.nix ./services/networking/bird.nix ./services/networking/bitlbee.nix @@ -793,7 +794,6 @@ ./services/web-servers/traefik.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix - ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix ./services/x11/colord.nix ./services/x11/compton.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 27b5f9e4b642f..a7e57b8608d79 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -34,7 +34,7 @@ let bashAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 622d2f96fe415..87f6816e4ac05 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -10,7 +10,7 @@ let fishAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 44756171b74cf..0e060e3f52261 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -148,7 +148,7 @@ in UseSTARTTLS=${yesNo cfg.useSTARTTLS} #Debug=YES ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} - ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"} + ${optionalString (cfg.authPassFile != null) "AuthPassFile=${cfg.authPassFile}"} ''; environment.systemPackages = [pkgs.ssmtp]; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b7117e5f90d78..bdb37eae23efb 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -12,7 +12,7 @@ let zshAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aa3d120c97f18..b2c030fb7791e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -210,6 +210,7 @@ with lib; (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 9c4c5545e35e7..9c7f846557279 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -248,7 +248,7 @@ let cfg = config.services.znapzend; onOff = b: if b then "on" else "off"; - nullOff = b: if isNull b then "off" else toString b; + nullOff = b: if b == null then "off" else toString b; stripSlashes = replaceStrings [ "/" ] [ "." ]; attrsToFile = config: concatStringsSep "\n" (builtins.attrValues ( @@ -256,7 +256,7 @@ let mkDestAttrs = dst: with dst; mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({ - "" = optionalString (! isNull host) "${host}:" + dataset; + "" = optionalString (host != null) "${host}:" + dataset; _plan = plan; } // optionalAttrs (presend != null) { _precmd = presend; diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 4368159ea6e3b..ee0ac632ecf08 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.3.1"; + version = "1.5.0"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -55,9 +55,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4"; + imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c"; finalImageTag = version; - sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5"; + sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q"; }; }; }; @@ -160,7 +160,7 @@ in { fallthrough in-addr.arpa ip6.arpa } prometheus :${toString ports.metrics} - proxy . /etc/resolv.conf + forward . /etc/resolv.conf cache 30 loop reload diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index 0c04648355b42..f293dd79f42a9 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -184,6 +184,12 @@ in type = bool; }; + preferredAddressTypes = mkOption { + description = "List of the preferred NodeAddressTypes to use for kubelet connections."; + type = nullOr str; + default = null; + }; + proxyClientCertFile = mkOption { description = "Client certificate to use for connections to proxy."; default = null; @@ -349,6 +355,8 @@ in "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \ ${optionalString (cfg.kubeletClientKeyFile != null) "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \ + ${optionalString (cfg.preferredAddressTypes != null) + "--kubelet-preferred-address-types=${cfg.preferredAddressTypes}"} \ ${optionalString (cfg.proxyClientCertFile != null) "--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \ ${optionalString (cfg.proxyClientKeyFile != null) diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2a4a0624555d8..ccc8a16e788a7 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -7,9 +7,9 @@ let cfg = top.kubelet; cniConfig = - if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + if cfg.cni.config != [] && cfg.cni.configDir != null then throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.cni.configDir) then + else if cfg.cni.configDir != null then cfg.cni.configDir else (pkgs.buildEnv { @@ -373,7 +373,7 @@ in boot.kernelModules = ["br_netfilter"]; services.kubernetes.kubelet.hostname = with config.networking; - mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + mkDefault (hostName + optionalString (domain != null) ".${domain}"); services.kubernetes.pki.certs = with top.lib; { kubelet = mkCert { diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 32eacad9025f4..e68660e8bdd4c 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -285,7 +285,7 @@ in }; }; - environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null) (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig); environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 2136778aff472..12cc3d2b1ccce 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -236,7 +236,7 @@ in }; assertions = [ - { assertion = cfg.hooksPath == hooksDir || all isNull (attrValues cfg.hooks); + { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agent.hooksPath' and `services.buildkite-agent.hooks.<name>' are mutually exclusive. diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1eca45fbd570c..ec6a36413fe7b 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -189,7 +189,7 @@ in { preStart = let replacePlugins = - if isNull cfg.plugins + if cfg.plugins == null then "" else let pluginCmds = lib.attrsets.mapAttrsToList diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index d741ee48c48f0..688938868020a 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -22,11 +22,11 @@ let else {}) ); cassandraConfigWithAddresses = cassandraConfig // - ( if isNull cfg.listenAddress + ( if cfg.listenAddress == null then { listen_interface = cfg.listenInterface; } else { listen_address = cfg.listenAddress; } ) // ( - if isNull cfg.rpcAddress + if cfg.rpcAddress == null then { rpc_interface = cfg.rpcInterface; } else { rpc_address = cfg.rpcAddress; } ); @@ -219,19 +219,13 @@ in { config = mkIf cfg.enable { assertions = [ { assertion = - ((isNull cfg.listenAddress) - || (isNull cfg.listenInterface) - ) && !((isNull cfg.listenAddress) - && (isNull cfg.listenInterface) - ); + (cfg.listenAddress == null || cfg.listenInterface == null) + && !(cfg.listenAddress == null && cfg.listenInterface == null); message = "You have to set either listenAddress or listenInterface"; } { assertion = - ((isNull cfg.rpcAddress) - || (isNull cfg.rpcInterface) - ) && !((isNull cfg.rpcAddress) - && (isNull cfg.rpcInterface) - ); + (cfg.rpcAddress == null || cfg.rpcInterface == null) + && !(cfg.rpcAddress == null && cfg.rpcInterface == null); message = "You have to set either rpcAddress or rpcInterface"; } ]; @@ -276,7 +270,7 @@ in { }; }; systemd.timers.cassandra-full-repair = - mkIf (!isNull cfg.fullRepairInterval) { + mkIf (cfg.fullRepairInterval != null) { description = "Schedule full repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = @@ -300,7 +294,7 @@ in { }; }; systemd.timers.cassandra-incremental-repair = - mkIf (!isNull cfg.incrementalRepairInterval) { + mkIf (cfg.incrementalRepairInterval != null) { description = "Schedule incremental repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index e977751b21efd..268fdcc819fd0 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -7,7 +7,7 @@ let crdb = cfg.package; escape = builtins.replaceStrings ["%"] ["%%"]; - ifNotNull = v: s: optionalString (!isNull v) s; + ifNotNull = v: s: optionalString (v != null) s; startupCommand = lib.concatStringsSep " " [ # Basic startup @@ -164,7 +164,7 @@ in config = mkIf config.services.cockroachdb.enable { assertions = [ - { assertion = !cfg.insecure -> !(isNull cfg.certsDir); + { assertion = !cfg.insecure -> cfg.certsDir != null; message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)"; } ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 89291d4438ff5..7e3c230fff710 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -133,7 +133,7 @@ in }; initialScript = mkOption { - type = types.nullOr types.lines; + type = types.nullOr types.path; default = null; description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; }; @@ -360,9 +360,11 @@ in echo "Creating initial database: ${database.name}" ( echo 'create database `${database.name}`;' - ${optionalString (database ? "schema") '' + ${optionalString (database.schema != null) '' echo 'use `${database.name}`;' + # TODO: this silently falls through if database.schema does not exist, + # we should catch this somehow and exit, but can't do it here because we're in a subshell. if [ -f "${database.schema}" ] then cat ${database.schema} @@ -399,7 +401,9 @@ in ${optionalString (cfg.initialScript != null) '' # Execute initial script - cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N + # using toString to avoid copying the file to nix store if given as path instead of string, + # as it might contain credentials + cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N ''} ${optionalString (cfg.rootPassword != null) diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 1a34c7f5ecee6..1050c2dd481ad 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -16,7 +16,7 @@ let super_only = ${builtins.toJSON cfg.superOnly} - ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"} + ${optionalString (cfg.loginGroup != null) "login_group = ${cfg.loginGroup}"} login_timeout = ${toString cfg.loginTimeout} @@ -24,7 +24,7 @@ let sql_root = ${cfg.sqlRoot} - ${optionalString (!isNull cfg.tls) '' + ${optionalString (cfg.tls != null) '' tls_cert = ${cfg.tls.cert} tls_key = ${cfg.tls.key} ''} diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 87b236dd5fd1d..5661edbee2dbd 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -105,6 +105,80 @@ in ''; }; + ensureDatabases = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Ensures that the specified databases exist. + This option will never delete existing databases, especially not when the value of this + option is changed. This means that databases created once through this option or + otherwise have to be removed manually. + ''; + example = [ + "gitea" + "nextcloud" + ]; + }; + + ensureUsers = mkOption { + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + Name of the user to ensure. + ''; + }; + ensurePermissions = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + Permissions to ensure for the user, specified as an attribute set. + The attribute names specify the database and tables to grant the permissions for. + The attribute values specify the permissions to grant. You may specify one or + multiple comma-separated SQL privileges here. + + For more information on how to specify the target + and on which privileges exist, see the + <link xlink:href="https://www.postgresql.org/docs/current/sql-grant.html">GRANT syntax</link>. + The attributes are used as <code>GRANT ''${attrName} ON ''${attrValue}</code>. + ''; + example = literalExample '' + { + "DATABASE nextcloud" = "ALL PRIVILEGES"; + "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; + } + ''; + }; + }; + }); + default = []; + description = '' + Ensures that the specified users exist and have at least the ensured permissions. + The PostgreSQL users will be identified using peer authentication. This authenticates the Unix user with the + same name only, and that without the need for a password. + This option will never delete existing users or remove permissions, especially not when the value of this + option is changed. This means that users created and permissions assigned once through this option or + otherwise have to be removed manually. + ''; + example = literalExample '' + [ + { + name = "nextcloud"; + ensurePermissions = { + "DATABASE nextcloud" = "ALL PRIVILEGES"; + }; + } + { + name = "superuser"; + ensurePermissions = { + "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; + }; + } + ] + ''; + }; + enableTCPIP = mkOption { type = types.bool; default = false; @@ -256,17 +330,30 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - while ! ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do + PSQL="${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port}" + + while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi sleep 0.1 done if test -e "${cfg.dataDir}/.first_startup"; then ${optionalString (cfg.initialScript != null) '' - ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres + $PSQL -f "${cfg.initialScript}" -d postgres ''} rm -f "${cfg.dataDir}/.first_startup" fi + '' + optionalString (cfg.ensureDatabases != []) '' + ${concatMapStrings (database: '' + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc "CREATE DATABASE ${database}" + '') cfg.ensureDatabases} + '' + '' + ${concatMapStrings (user: '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}" + ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' + $PSQL -tAc "GRANT ${permission} ON ${database} TO ${user.name}" + '') user.ensurePermissions)} + '') cfg.ensureUsers} ''; unitConfig.RequiresMountsFor = "${cfg.dataDir}"; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 3f6bf9de8931b..d04673a6c8b8a 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -6,7 +6,7 @@ let cfg = config.services.factorio; factorio = pkgs.factorio-headless; name = "Factorio"; - stateDir = cfg.stateDir; + stateDir = "/var/lib/${cfg.stateDirName}"; mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true @@ -80,11 +80,11 @@ in customizations. ''; }; - stateDir = mkOption { - type = types.path; - default = "/var/lib/factorio"; + stateDirName = mkOption { + type = types.string; + default = "factorio"; description = '' - The server's data directory. + Name of the directory under /var/lib holding the server's data. The configuration and map will be stored here. ''; @@ -176,20 +176,6 @@ in }; config = mkIf cfg.enable { - users = { - users.factorio = { - uid = config.ids.uids.factorio; - description = "Factorio server user"; - group = "factorio"; - home = stateDir; - createHome = true; - }; - - groups.factorio = { - gid = config.ids.gids.factorio; - }; - }; - systemd.services.factorio = { description = "Factorio headless server"; wantedBy = [ "multi-user.target" ]; @@ -205,12 +191,10 @@ in ]; serviceConfig = { - User = "factorio"; - Group = "factorio"; Restart = "always"; KillSignal = "SIGINT"; - WorkingDirectory = stateDir; - PrivateTmp = true; + DynamicUser = true; + StateDirectory = cfg.stateDirName; UMask = "0007"; ExecStart = toString [ "${factorio}/bin/factorio" @@ -220,6 +204,20 @@ in "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") ]; + + # Sandboxing + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; }; }; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 7d26d15016503..39a68f4b55365 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -215,8 +215,8 @@ in { networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then { allowedUDPPorts = [ serverPort ]; allowedTCPPorts = [ serverPort ] - ++ optional (! isNull queryPort) queryPort - ++ optional (! isNull rconPort) rconPort; + ++ optional (queryPort != null) queryPort + ++ optional (rconPort != null) rconPort; } else { allowedUDPPorts = [ defaultServerPort ]; allowedTCPPorts = [ defaultServerPort ]; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 9c64160e92bc2..f139190a17094 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -227,7 +227,7 @@ in ''; services.cron.systemCronJobs = - let withTime = name: {timeArgs, ...}: ! (builtins.isNull timeArgs); + let withTime = name: {timeArgs, ...}: timeArgs != null; mkCron = name: {user, cmdline, timeArgs, ...}: '' ${timeArgs} ${user} ${cmdline} ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 30ad7d82fb801..139011dca23ab 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -16,13 +16,13 @@ let sendmail_path = /run/wrappers/bin/sendmail '' - (if isNull cfg.sslServerCert then '' + (if cfg.sslServerCert == null then '' ssl = no disable_plaintext_auth = no '' else '' ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} - ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} ssl_dh = <${config.security.dhparams.params.dovecot2.path} disable_plaintext_auth = yes '') @@ -298,7 +298,7 @@ in config = mkIf cfg.enable { security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - security.dhparams = mkIf (! isNull cfg.sslServerCert) { + security.dhparams = mkIf (cfg.sslServerCert != null) { enable = true; params.dovecot2 = {}; }; @@ -384,14 +384,14 @@ in { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; } - { assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey - && (!(isNull cfg.sslCACert) -> !(isNull cfg.sslServerCert || isNull cfg.sslServerKey)); + { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) + && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto"; } { assertion = cfg.showPAMFailure -> cfg.enablePAM; message = "dovecot is configured with showPAMFailure while enablePAM is disabled"; } - { assertion = (cfg.sieveScripts != {}) -> ((cfg.mailUser != null) && (cfg.mailGroup != null)); + { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null); message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set"; } ]; diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 006feca42b32d..87d3606814459 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -143,7 +143,7 @@ in serviceConfig = { Type = "simple"; PrivateTmp = true; - ExecStartPre = assert !isNull server.secretKeyFile; pkgs.writeScript "bepasty-server.${name}-init" '' + ExecStartPre = assert server.secretKeyFile != null; pkgs.writeScript "bepasty-server.${name}-init" '' #!/bin/sh mkdir -p "${server.workDir}" mkdir -p "${server.dataDir}" diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index ac6ba2181de28..256adce2f02e1 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -81,7 +81,7 @@ in { systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let - dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else + dataDir = if instanceCfg.dataDir != null then instanceCfg.dataDir else "/var/lib/errbot/${name}"; in { after = [ "network-online.target" ]; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 483bc99ad946e..07dbee69db0c5 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -48,7 +48,7 @@ let type = types.nullOr types.int; default = null; example = 365; - apply = val: if isNull val then -1 else val; + apply = val: if val == null then -1 else val; description = mkAutoDesc '' The expiration time of ${desc} in days or <literal>null</literal> for no expiration time. @@ -82,7 +82,7 @@ let then attrByPath newPath (notFound newPath) cfg.pki.manual else findPkiDefinitions newPath val; in flatten (mapAttrsToList mkSublist attrs); - in all isNull (findPkiDefinitions [] manualPkiOptions); + in all (x: x == null) (findPkiDefinitions [] manualPkiOptions); orgOptions = { ... }: { options.users = mkOption { diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 2bd2f3c7cc08a..01720ba432ed1 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -17,7 +17,7 @@ let defaultDir = "/var/lib/${user}"; home = if useCustomDir then cfg.storageDir else defaultDir; - useCustomDir = !(builtins.isNull cfg.storageDir); + useCustomDir = cfg.storageDir != null; socket = "/run/phpfpm/${dirName}.sock"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 2365142af40ec..d6473220c1409 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -19,13 +19,13 @@ let graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( "STATIC_ROOT = '${staticDir}'\n" + - optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n" + optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + cfg.web.extraConfig ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' search_index: ${dataDir}/index - ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} + ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix new file mode 100644 index 0000000000000..e94265564595e --- /dev/null +++ b/nixos/modules/services/networking/bitcoind.nix @@ -0,0 +1,195 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.bitcoind; + pidFile = "${cfg.dataDir}/bitcoind.pid"; + configFile = pkgs.writeText "bitcoin.conf" '' + ${optionalString cfg.testnet "testnet=1"} + ${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"} + ${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"} + + # Connection options + ${optionalString (cfg.port != null) "port=${toString cfg.port}"} + + # RPC server options + ${optionalString (cfg.rpc.port != null) "rpcport=${toString cfg.rpc.port}"} + ${concatMapStringsSep "\n" + (rpcUser: "rpcauth=${rpcUser.name}:${rpcUser.passwordHMAC}") + (attrValues cfg.rpc.users) + } + + # Extra config options (from bitcoind nixos service) + ${cfg.extraConfig} + ''; + cmdlineOptions = escapeShellArgs [ + "-conf=${cfg.configFile}" + "-datadir=${cfg.dataDir}" + "-pid=${pidFile}" + ]; + hexStr = types.strMatching "[0-9a-f]+"; + rpcUserOpts = { name, ... }: { + options = { + name = mkOption { + type = types.str; + example = "alice"; + description = '' + Username for JSON-RPC connections. + ''; + }; + passwordHMAC = mkOption { + type = with types; uniq (strMatching "[0-9a-f]+\\$[0-9a-f]{64}"); + example = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; + description = '' + Password HMAC-SHA-256 for JSON-RPC connections. Must be a string of the + format <SALT-HEX>$<HMAC-HEX>. + ''; + }; + }; + config = { + name = mkDefault name; + }; + }; +in { + options = { + + services.bitcoind = { + enable = mkEnableOption "Bitcoin daemon"; + + package = mkOption { + type = types.package; + default = pkgs.altcoins.bitcoind; + defaultText = "pkgs.altcoins.bitcoind"; + description = "The package providing bitcoin binaries."; + }; + configFile = mkOption { + type = types.path; + default = configFile; + example = "/etc/bitcoind.conf"; + description = "The configuration file path to supply bitcoind."; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + par=16 + rpcthreads=16 + logips=1 + ''; + description = "Additional configurations to be appended to <filename>bitcoin.conf</filename>."; + }; + dataDir = mkOption { + type = types.path; + default = "/var/lib/bitcoind"; + description = "The data directory for bitcoind."; + }; + + user = mkOption { + type = types.str; + default = "bitcoin"; + description = "The user as which to run bitcoind."; + }; + group = mkOption { + type = types.str; + default = cfg.user; + description = "The group as which to run bitcoind."; + }; + + rpc = { + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Override the default port on which to listen for JSON-RPC connections."; + }; + users = mkOption { + default = {}; + example = literalExample '' + { + alice.passwordHMAC = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; + bob.passwordHMAC = "b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99"; + } + ''; + type = with types; loaOf (submodule rpcUserOpts); + description = '' + RPC user information for JSON-RPC connnections. + ''; + }; + }; + + testnet = mkOption { + type = types.bool; + default = false; + description = "Whether to use the test chain."; + }; + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Override the default port on which to listen for connections."; + }; + dbCache = mkOption { + type = types.nullOr (types.ints.between 4 16384); + default = null; + example = 4000; + description = "Override the default database cache size in megabytes."; + }; + prune = mkOption { + type = types.nullOr (types.coercedTo + (types.enum [ "disable" "manual" ]) + (x: if x == "disable" then 0 else 1) + types.ints.unsigned + ); + default = null; + example = 10000; + description = '' + Reduce storage requirements by enabling pruning (deleting) of old + blocks. This allows the pruneblockchain RPC to be called to delete + specific blocks, and enables automatic pruning of old blocks if a + target size in MiB is provided. This mode is incompatible with -txindex + and -rescan. Warning: Reverting this setting requires re-downloading + the entire blockchain. ("disable" = disable pruning blocks, "manual" + = allow manual pruning via RPC, >=550 = automatically prune block files + to stay under the specified target size in MiB) + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + "L '${cfg.dataDir}/bitcoin.conf' - - - - '${cfg.configFile}'" + ]; + systemd.services.bitcoind = { + description = "Bitcoin daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/bitcoind ${cmdlineOptions}"; + Restart = "on-failure"; + + # Hardening measures + PrivateTmp = "true"; + ProtectSystem = "full"; + NoNewPrivileges = "true"; + PrivateDevices = "true"; + MemoryDenyWriteExecute = "true"; + + # Permission for preStart + PermissionsStartOnly = "true"; + }; + }; + users.users.${cfg.user} = { + name = cfg.user; + group = cfg.group; + description = "Bitcoin daemon user"; + home = cfg.dataDir; + }; + users.groups.${cfg.group} = { + name = cfg.group; + }; + }; +} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index c1f778ac139a1..dd2f6454e9540 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -92,7 +92,7 @@ in { Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; type = types.nullOr types.str; - default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}"); + default = with config.networking; (hostName + optionalString (domain != null) ".${domain}"); example = "node1.example.com"; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 40478b85b75e9..f2be417738ee8 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -12,9 +12,9 @@ let boolOpt = k: v: k + " = " + boolToString v; intOpt = k: v: k + " = " + toString v; lstOpt = k: xs: k + " = " + concatStringsSep "," xs; - optionalNullString = o: s: optional (! isNull s) (strOpt o s); - optionalNullBool = o: b: optional (! isNull b) (boolOpt o b); - optionalNullInt = o: i: optional (! isNull i) (intOpt o i); + optionalNullString = o: s: optional (s != null) (strOpt o s); + optionalNullBool = o: b: optional (b != null) (boolOpt o b); + optionalNullInt = o: i: optional (i != null) (intOpt o i); optionalEmptyList = o: l: optional ([] != l) (lstOpt o l); mkEnableTrueOption = name: mkEnableOption name // { default = true; }; @@ -225,7 +225,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh exec ${pkgs.i2pd}/bin/i2pd \ - ${if isNull cfg.address then "" else "--host="+cfg.address} \ + ${if cfg.address == null then "" else "--host="+cfg.address} \ --service \ --conf=${i2pdConf} \ --tunconf=${tunnelConf} diff --git a/nixos/modules/services/networking/mxisd.nix b/nixos/modules/services/networking/mxisd.nix index 0b9824f29fd79..02e89f441b345 100644 --- a/nixos/modules/services/networking/mxisd.nix +++ b/nixos/modules/services/networking/mxisd.nix @@ -103,20 +103,12 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - # mxisd / spring.boot needs the configuration to be named "application.yaml" - preStart = '' - config=${cfg.dataDir}/application.yaml - cp ${configFile} $config - chmod 444 $config - ''; - serviceConfig = { Type = "simple"; User = "mxisd"; Group = "mxisd"; - ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom"; + ExecStart = "${cfg.package}/bin/mxisd -c ${configFile}"; WorkingDirectory = cfg.dataDir; - SuccessExitStatus = 143; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index cbb305cd38250..89f56a726f462 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -4,6 +4,15 @@ with lib; let + sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } '' + cat >$out <<EOL + ${cfg.extraConfig} + EOL + + ssh-keygen -f mock-hostkey -N "" + sshd -t -f $out -h mock-hostkey + ''; + cfg = config.services.openssh; cfgc = config.programs.ssh; @@ -339,7 +348,7 @@ in environment.etc = authKeysFiles // { "ssh/moduli".source = cfg.moduliFile; - "ssh/sshd_config".text = cfg.extraConfig; + "ssh/sshd_config".source = sshconf; }; systemd = diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 5e74a96664f06..95a174122d04f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -56,7 +56,7 @@ rec { }; documentDefault = description : strongswanDefault : - if isNull strongswanDefault + if strongswanDefault == null then description else description + '' </para><para> diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index fb87e81f32151..193ad27f035a7 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -45,10 +45,10 @@ rec { filterEmptySets ( (mapParamsRecursive (path: name: param: let value = attrByPath path null cfg; - in optionalAttrs (!isNull value) (param.render name value) + in optionalAttrs (value != null) (param.render name value) ) ps)); - filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + filterEmptySets = set : filterAttrs (n: v: (v != null)) (mapAttrs (name: value: if isAttrs value then let value' = filterEmptySets value; in if value' == {} diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 114a64dfb175a..d495703fc5392 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -5,6 +5,60 @@ with lib; let cfg = config.services.syncthing; defaultUser = "syncthing"; + + devices = mapAttrsToList (name: device: { + deviceID = device.id; + inherit (device) name addresses introducer; + }) cfg.declarative.devices; + + folders = mapAttrsToList ( _: folder: { + inherit (folder) path id label type; + devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices; + rescanIntervalS = folder.rescanInterval; + fsWatcherEnabled = folder.watch; + fsWatcherDelayS = folder.watchDelay; + ignorePerms = folder.ignorePerms; + }) (filterAttrs ( + _: folder: + folder.enable + ) cfg.declarative.folders); + + # get the api key by parsing the config.xml + getApiKey = pkgs.writers.writeDash "getAPIKey" '' + ${pkgs.libxml2}/bin/xmllint \ + --xpath 'string(configuration/gui/apikey)'\ + ${cfg.configDir}/config.xml + ''; + + updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' + set -efu + # wait for syncthing port to open + until ${pkgs.curl}/bin/curl -Ss ${cfg.guiAddress} -o /dev/null; do + sleep 1 + done + + API_KEY=$(${getApiKey}) + OLD_CFG=$(${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + ${cfg.guiAddress}/rest/system/config) + + # generate the new config by merging with the nixos config options + NEW_CFG=$(echo "$OLD_CFG" | ${pkgs.jq}/bin/jq -s '.[] as $in | $in * { + "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + $in.devices"}), + "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + $in.folders"}) + }') + + # POST the new config to syncthing + echo "$NEW_CFG" | ${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + ${cfg.guiAddress}/rest/system/config -d @- + + # restart syncthing after sending the new config + ${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + -X POST \ + ${cfg.guiAddress}/rest/system/restart + ''; in { ###### interface options = { @@ -16,6 +70,197 @@ in { available on http://127.0.0.1:8384/. ''; + declarative = { + cert = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users cert.pem file, will be copied into the syncthing's + <literal>configDir</literal> + ''; + }; + + key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users key.pem file, will be copied into the syncthing's + <literal>configDir</literal> + ''; + }; + + overrideDevices = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the devices which are not configured via the + <literal>declarative.devices</literal> option. + If set to false, devices added via the webinterface will + persist but will have to be deleted manually. + ''; + }; + + devices = mkOption { + default = {}; + description = '' + Peers/devices which syncthing should communicate with. + ''; + example = [ + { + name = "bigbox"; + id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + addresses = [ "tcp://192.168.0.10:51820" ]; + } + ]; + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + + name = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + Name of the device + ''; + }; + + addresses = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The addresses used to connect to the device. + If this is let empty, dynamic configuration is attempted + ''; + }; + + id = mkOption { + type = types.str; + description = '' + The id of the other peer, this is mandatory. It's documented at + https://docs.syncthing.net/dev/device-ids.html + ''; + }; + + introducer = mkOption { + type = types.bool; + default = false; + description = '' + If the device should act as an introducer and be allowed + to add folders on this computer. + ''; + }; + + }; + })); + }; + + overrideFolders = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the folders which are not configured via the + <literal>declarative.folders</literal> option. + If set to false, folders added via the webinterface will persist + but will have to be deleted manually. + ''; + }; + + folders = mkOption { + default = {}; + description = '' + folders which should be shared by syncthing. + ''; + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + + enable = mkOption { + type = types.bool; + default = true; + description = '' + share this folder. + This option is useful when you want to define all folders + in one place, but not every machine should share all folders. + ''; + }; + + path = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The path to the folder which should be shared. + ''; + }; + + id = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The id of the folder. Must be the same on all devices. + ''; + }; + + label = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The label of the folder. + ''; + }; + + devices = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The devices this folder should be shared with. Must be defined + in the <literal>declarative.devices</literal> attribute. + ''; + }; + + rescanInterval = mkOption { + type = types.int; + default = 3600; + description = '' + How often the folders should be rescaned for changes. + ''; + }; + + type = mkOption { + type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; + default = "sendreceive"; + description = '' + Whether to send only changes from this folder, only receive them + or propagate both. + ''; + }; + + watch = mkOption { + type = types.bool; + default = true; + description = '' + Whether the folder should be watched for changes by inotify. + ''; + }; + + watchDelay = mkOption { + type = types.int; + default = 10; + description = '' + The delay after an inotify event is triggered. + ''; + }; + + ignorePerms = mkOption { + type = types.bool; + default = true; + description = '' + Whether to propagate permission changes. + ''; + }; + + }; + })); + }; + }; + guiAddress = mkOption { type = types.str; default = "127.0.0.1:8384"; @@ -151,6 +396,23 @@ in { RestartForceExitStatus="3 4"; User = cfg.user; Group = cfg.group; + ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null) + "+${pkgs.writers.writeBash "syncthing-copy-keys" '' + mkdir -p ${cfg.configDir} + chown ${cfg.user}:${cfg.group} ${cfg.configDir} + chmod 700 ${cfg.configDir} + ${optionalString (cfg.declarative.cert != null) '' + cp ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem + chown ${cfg.user}:${cfg.group} ${cfg.configDir}/cert.pem + chmod 400 ${cfg.configDir}/cert.pem + ''} + ${optionalString (cfg.declarative.key != null) '' + cp ${toString cfg.declarative.key} ${cfg.configDir}/key.pem + chown ${cfg.user}:${cfg.group} ${cfg.configDir}/key.pem + chmod 400 ${cfg.configDir}/key.pem + ''} + ''}" + ; ExecStart = '' ${cfg.package}/bin/syncthing \ -no-browser \ @@ -159,6 +421,17 @@ in { ''; }; }; + syncthing-init = { + after = [ "syncthing.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + RemainAfterExit = true; + Type = "oneshot"; + ExecStart = updateConfig; + }; + }; syncthing-resume = { wantedBy = [ "suspend.target" ]; diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 0022450278043..2d7cd5cebb486 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -146,7 +146,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.xinetd ]; - script = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; + script = "exec xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; }; }; } diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 2a6e8250850c6..c096af731ad47 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -129,7 +129,7 @@ in { This defaults to the singleton list [ca] when the <option>ca</option> option is defined. ''; - default = if isNull cfg.elasticsearch.ca then [] else [ca]; + default = if cfg.elasticsearch.ca == null then [] else [ca]; type = types.listOf types.path; }; diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 9ed7f2a2efd99..8ece1ca190130 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -25,6 +25,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.fprintd; + defaultText = "pkgs.fprintd"; + example = "pkgs.fprintd-thinkpad"; + description = '' + fprintd package to use. + ''; + }; + }; }; @@ -38,7 +48,7 @@ in environment.systemPackages = [ pkgs.fprintd ]; - systemd.packages = [ pkgs.fprintd ]; + systemd.packages = [ cfg.package ]; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 0c5fe8c0ef5ff..61f203ef9e7d8 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -58,11 +58,11 @@ let httponly = cookie.httpOnly; }; set-xauthrequest = setXauthrequest; - } // lib.optionalAttrs (!isNull cfg.email.addresses) { + } // lib.optionalAttrs (cfg.email.addresses != null) { authenticated-emails-file = authenticatedEmailsFile; } // lib.optionalAttrs (cfg.passBasicAuth) { basic-auth-password = cfg.basicAuthPassword; - } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + } // lib.optionalAttrs (cfg.htpasswd.file != null) { display-htpasswd-file = cfg.htpasswd.displayForm; } // lib.optionalAttrs tls.enable { tls-cert = tls.certificate; @@ -71,7 +71,7 @@ let } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; mapConfig = key: attr: - if (!isNull attr && attr != []) then ( + if attr != null && attr != [] then ( if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else @@ -538,7 +538,7 @@ in config = mkIf cfg.enable { - services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + services.oauth2_proxy = mkIf (cfg.keyFile != null) { clientID = mkDefault null; clientSecret = mkDefault null; cookie.secret = mkDefault null; diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 644aad82df2ca..910e1d937bf35 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -215,7 +215,7 @@ in { # /etc/icingaweb2 environment.etc = let - doModule = name: optionalAttrs (cfg.modules."${name}".enable) (nameValuePair "icingaweb2/enabledModules/${name}" { source = "${pkgs.icingaweb2}/modules/${name}"; }); + doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; in {} # Module packages // (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages) diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 1d60004e574df..304712d0efc3e 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -85,7 +85,7 @@ in DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if isNull cfg.adminCredentialsFile + EnvironmentFile = if cfg.adminCredentialsFile == null then defaultCredentials else cfg.adminCredentialsFile; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d0e45e1c12a59..bb39a5d1d7143 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -257,6 +257,23 @@ in { ''; }; }; + autoUpdateApps = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Run regular auto update of all apps installed from the nextcloud app store. + ''; + }; + startAt = mkOption { + type = with types; either str (listOf str); + default = "05:00:00"; + example = "Sun 14:00:00"; + description = '' + When to run the update. See `systemd.services.<name>.startAt`. + ''; + }; + }; }; config = mkIf cfg.enable (mkMerge [ @@ -362,6 +379,11 @@ in { serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; }; + "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable { + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; + startAt = cfg.autoUpdateApps.startAt; + }; }; services.phpfpm = { diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index dfefa55c5d5ea..d78d866086a60 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -111,5 +111,11 @@ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/49783">#49783</link>, for now it's unfortunately necessary to manually work around these issues. </para> + + <para> + Right now app installation and configuration is done imperatively in the nextcloud web ui or via the <literal>nextcloud-occ</literal> command line utility. + You can activate auto updates for your apps via + <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>. + </para> </section> </chapter> diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 15fd943a0826c..2e5e0ea6622db 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -184,7 +184,7 @@ in phpOptions = '' date.timezone = "CET" - ${optionalString (!isNull cfg.email.server) '' + ${optionalString (cfg.email.server != null) '' SMTP = ${cfg.email.server} smtp_port = ${toString cfg.email.port} auth_username = ${cfg.email.login} @@ -282,7 +282,7 @@ in sed -i "s@^php@${config.services.phpfpm.phpPackage}/bin/php@" "${runDir}/server/php/shell/"*.sh - ${if (isNull cfg.database.host) then '' + ${if (cfg.database.host == null) then '' sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', 'localhost');/g" "${runDir}/server/php/config.inc.php" sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" '' else '' @@ -311,7 +311,7 @@ in chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" - ${optionalString (isNull cfg.database.host) '' + ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \ @@ -367,14 +367,14 @@ in }; users.groups.restya-board = {}; - services.postgresql.enable = mkIf (isNull cfg.database.host) true; + services.postgresql.enable = mkIf (cfg.database.host == null) true; - services.postgresql.identMap = optionalString (isNull cfg.database.host) + services.postgresql.identMap = optionalString (cfg.database.host == null) '' restya-board-users restya-board restya_board ''; - services.postgresql.authentication = optionalString (isNull cfg.database.host) + services.postgresql.authentication = optionalString (cfg.database.host == null) '' local restya_board all ident map=restya-board-users ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 8f00f81b078cb..a8fb11f114ece 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -690,7 +690,7 @@ in ; Don't advertise PHP expose_php = off - '' + optionalString (!isNull config.time.timeZone) '' + '' + optionalString (config.time.timeZone != null) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix deleted file mode 100644 index 064ead5ce4bb3..0000000000000 --- a/nixos/modules/services/web-servers/winstone.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.winstone; - - winstoneOpts = { name, ... }: { - options = { - name = mkOption { - default = name; - internal = true; - }; - - serviceName = mkOption { - type = types.str; - description = '' - The name of the systemd service. By default, it is - derived from the winstone instance name. - ''; - }; - - warFile = mkOption { - type = types.str; - description = '' - The WAR file that Winstone should serve. - ''; - }; - - javaPackage = mkOption { - type = types.package; - default = pkgs.jre; - defaultText = "pkgs.jre"; - description = '' - Which Java derivation to use for running Winstone. - ''; - }; - - user = mkOption { - type = types.str; - description = '' - The user that should run this Winstone process and - own the working directory. - ''; - }; - - group = mkOption { - type = types.str; - description = '' - The group that will own the working directory. - ''; - }; - - workDir = mkOption { - type = types.str; - description = '' - The working directory for this Winstone instance. Will - contain extracted webapps etc. The directory will be - created if it doesn't exist. - ''; - }; - - extraJavaOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the java process running - Winstone. - ''; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the Winstone process. - ''; - }; - }; - - config = { - workDir = mkDefault "/run/winstone/${name}"; - serviceName = mkDefault "winstone-${name}"; - }; - }; - - mkService = cfg: let - opts = concatStringsSep " " (cfg.extraOptions ++ [ - "--warfile ${cfg.warFile}" - ]); - - javaOpts = concatStringsSep " " (cfg.extraJavaOptions ++ [ - "-Djava.io.tmpdir=${cfg.workDir}" - "-jar ${pkgs.winstone}/lib/winstone.jar" - ]); - in { - wantedBy = [ "multi-user.target" ]; - description = "winstone service for ${cfg.name}"; - preStart = '' - mkdir -p "${cfg.workDir}" - chown ${cfg.user}:${cfg.group} "${cfg.workDir}" - ''; - serviceConfig = { - ExecStart = "${cfg.javaPackage}/bin/java ${javaOpts} ${opts}"; - User = cfg.user; - PermissionsStartOnly = true; - }; - }; - -in { - - options = { - services.winstone = mkOption { - default = {}; - type = with types; attrsOf (submodule winstoneOpts); - description = '' - Defines independent Winstone services, each serving one WAR-file. - ''; - }; - }; - - config = mkIf (cfg != {}) { - - systemd.services = mapAttrs' (n: c: nameValuePair c.serviceName (mkService c)) cfg; - - }; - -} diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix index 17568df091d40..cf113ad2af8c9 100644 --- a/nixos/modules/services/x11/colord.nix +++ b/nixos/modules/services/x11/colord.nix @@ -29,6 +29,7 @@ in { environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf"; users.users.colord = { + isSystemUser = true; home = "/var/lib/colord"; group = "colord"; }; diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 43de746ab1f16..a6055f26789ef 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -10,6 +10,14 @@ let optionals cfg.enableContribAndExtras [ self.xmonad-contrib self.xmonad-extras ]; }; + xmonadBin = pkgs.writers.writeHaskell "xmonad" { + ghc = cfg.haskellPackages.ghc; + libraries = [ cfg.haskellPackages.xmonad ] ++ + cfg.extraPackages cfg.haskellPackages ++ + optionals cfg.enableContribAndExtras + (with cfg.haskellPackages; [ xmonad-contrib xmonad-extras ]); + } cfg.config; + in { options = { @@ -48,13 +56,36 @@ in type = lib.types.bool; description = "Enable xmonad-{contrib,extras} in Xmonad."; }; + + config = mkOption { + default = null; + type = with lib.types; nullOr (either path string); + description = '' + Configuration from which XMonad gets compiled. If no value + is specified, the xmonad config from $HOME/.xmonad is taken. + If you use xmonad --recompile, $HOME/.xmonad will be taken as + the configuration, but on the next restart of display-manager + this config will be reapplied. + ''; + example = '' + import XMonad + + main = launch defaultConfig + { modMask = mod4Mask -- Use Super instead of Alt + , terminal = "urxvt" + } + ''; + }; }; }; config = mkIf cfg.enable { services.xserver.windowManager = { session = [{ name = "xmonad"; - start = '' + start = if (cfg.config != null) then '' + ${xmonadBin} + waitPID=$! + '' else '' ${xmonad}/bin/xmonad & waitPID=$! ''; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 6016a85ea0610..940d4c0eb973a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -33,6 +33,15 @@ initrd {initrd} options {kernel_params} """ +# The boot loader entry for memtest86. +# +# TODO: This is hard-coded to use the 64-bit EFI app, but it could probably +# be updated to use the 32-bit EFI app on 32-bit systems. The 32-bit EFI +# app filename is BOOTIA32.efi. +MEMTEST_BOOT_ENTRY = """title MemTest86 +efi /efi/memtest86/BOOTX64.efi +""" + def write_loader_conf(profile, generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": @@ -199,6 +208,24 @@ def main(): if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + if os.path.exists(memtest_entry_file): + os.unlink(memtest_entry_file) + shutil.rmtree("@efiSysMountPoint@/efi/memtest86", ignore_errors=True) + if "@memtest86@" != "": + mkdir_p("@efiSysMountPoint@/efi/memtest86") + for path in glob.iglob("@memtest86@/*"): + if os.path.isdir(path): + shutil.copytree(path, os.path.join("@efiSysMountPoint@/efi/memtest86", os.path.basename(path))) + else: + shutil.copy(path, "@efiSysMountPoint@/efi/memtest86/") + + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + memtest_entry_file_tmp_path = "%s.tmp" % memtest_entry_file + with open(memtest_entry_file_tmp_path, 'w') as f: + f.write(MEMTEST_BOOT_ENTRY) + os.rename(memtest_entry_file_tmp_path, memtest_entry_file) + # Since fat32 provides little recovery facilities after a crash, # it can leave the system in an unbootable state, when a crash/outage # happens shortly after an update. To decrease the likelihood of this diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 03a5fece82ee3..ad464a456bcda 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -25,6 +25,8 @@ let inherit (cfg) consoleMode; inherit (efi) efiSysMountPoint canTouchEfiVariables; + + memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; }; in { @@ -85,6 +87,19 @@ in { </itemizedlist> ''; }; + + memtest86 = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Make MemTest86 available from the systemd-boot menu. MemTest86 is a + program for testing memory. MemTest86 is an unfree program, so + this requires <literal>allowUnfree</literal> to be set to + <literal>true</literal>. + ''; + }; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index c1f0ba303e32b..3e882a1383ff0 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -174,13 +174,13 @@ let "--rm" "--name=%n" "--log-driver=${container.log-driver}" - ] ++ optional (! isNull container.entrypoint) + ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}" + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}" + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" ++ map escapeShellArg container.extraDockerOptions ++ [container.image] ++ map escapeShellArg container.cmd diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ba04dfd57942f..7d196a46276ac 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -46,8 +46,8 @@ in description = '' When enabled dockerd is started on boot. This is required for - container, which are created with the - <literal>--restart=always</literal> flag, to work. If this option is + containers which are created with the + <literal>--restart=always</literal> flag to work. If this option is disabled, docker might be started on demand by socket activation. ''; }; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 0d2d25d30752a..d172ae38fdcfa 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -51,7 +51,7 @@ in popd ''; format = "raw"; - configFile = if isNull cfg.configFile then defaultConfigFile else cfg.configFile; + configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; inherit (cfg) diskSize; inherit config lib pkgs; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7ac6aba4ab3b1..9bce49c9e3027 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -89,11 +89,12 @@ in gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gjs = handleTest ./gjs.nix {}; - google-oslogin = handleTest ./google-oslogin {}; gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64 gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64 gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; + google-oslogin = handleTest ./google-oslogin {}; + graphene = handleTest ./graphene.nix {}; grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; @@ -151,6 +152,7 @@ in mumble = handleTest ./mumble.nix {}; munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; + mxisd = handleTest ./mxisd.nix {}; mysql = handleTest ./mysql.nix {}; mysqlBackup = handleTest ./mysql-backup.nix {}; mysqlReplication = handleTest ./mysql-replication.nix {}; @@ -220,6 +222,7 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sddm = handleTest ./sddm.nix {}; + signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; slim = handleTest ./slim.nix {}; slurm = handleTest ./slurm.nix {}; @@ -230,6 +233,7 @@ in strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; + syncthing-init = handleTest ./syncthing-init.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; diff --git a/nixos/tests/graphene.nix b/nixos/tests/graphene.nix new file mode 100644 index 0000000000000..5591bcc30c07e --- /dev/null +++ b/nixos/tests/graphene.nix @@ -0,0 +1,18 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "graphene"; + + meta = { + maintainers = pkgs.graphene.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.graphene.installedTests}/share'"); + ''; +}) diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index fedc7f0ab1f0b..cfe10bc41b0c9 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -10,7 +10,15 @@ import ./make-test.nix ({ pkgs, ...} : { { services.mysql.enable = true; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; + # note that using pkgs.writeText here is generally not a good idea, + # as it will store the password in world-readable /nix/store ;) + services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + ''; services.mysql.package = pkgs.mysql; }; @@ -36,11 +44,14 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $mysql->waitForUnit("mysql"); - $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mysql->succeed("echo 'use empty_testdb;' | mysql -u root"); + $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4"); + # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript + $mysql->succeed("echo ';' | mysql -u passworduser --password=password123"); $mariadb->waitForUnit("mysql"); $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"); $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser"); - $mariadb->succeed("echo 'use testdb; select test_id from tests' | sudo -u testuser mysql -u testuser -N | grep 42"); + $mariadb->succeed("echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"); ''; }) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index c3b710f0f904c..bfb97ec3f230a 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -22,6 +22,10 @@ in { # Don't inherit adminuser since "root" is supposed to be the default inherit adminpass; }; + autoUpdateApps = { + enable = true; + startAt = "20:00"; + }; }; }; }; diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index ea72a0121d11f..cbdb5c8d29543 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - redmineTest = package: makeTest { + mysqlTest = package: makeTest { machine = { config, pkgs, ... }: { services.mysql.enable = true; @@ -21,6 +21,7 @@ let services.redmine.enable = true; services.redmine.package = package; + services.redmine.database.type = "mysql2"; services.redmine.database.socket = "/run/mysqld/mysqld.sock"; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { @@ -38,7 +39,44 @@ let testScript = '' startAll; + $machine->waitForUnit('redmine.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; + + pgsqlTest = package: makeTest { + machine = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.ensureDatabases = [ "redmine" ]; + services.postgresql.ensureUsers = [ + { name = "redmine"; + ensurePermissions = { "DATABASE redmine" = "ALL PRIVILEGES"; }; + } + ]; + + services.redmine.enable = true; + services.redmine.package = package; + services.redmine.database.type = "postgresql"; + services.redmine.database.host = ""; + services.redmine.database.port = 5432; + services.redmine.plugins = { + redmine_env_auth = pkgs.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; + }; + }; + services.redmine.themes = { + dkuk-redmine_alex_skin = pkgs.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + }; + }; + testScript = '' + startAll; $machine->waitForUnit('redmine.service'); $machine->waitForOpenPort('3000'); $machine->succeed("curl --fail http://localhost:3000/"); @@ -46,13 +84,18 @@ let }; in { - redmine_3 = redmineTest pkgs.redmine // { - name = "redmine_3"; + v3-mysql = mysqlTest pkgs.redmine // { + name = "v3-mysql"; + meta.maintainers = [ maintainers.aanderse ]; + }; + + v4-mysql = mysqlTest pkgs.redmine_4 // { + name = "v4-mysql"; meta.maintainers = [ maintainers.aanderse ]; }; - redmine_4 = redmineTest pkgs.redmine_4 // { - name = "redmine_4"; + v4-pgsql = pgsqlTest pkgs.redmine_4 // { + name = "v4-pgsql"; meta.maintainers = [ maintainers.aanderse ]; }; } diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix new file mode 100644 index 0000000000000..605b9c3e1301b --- /dev/null +++ b/nixos/tests/signal-desktop.nix @@ -0,0 +1,37 @@ +import ./make-test.nix ({ pkgs, ...} : + +{ + name = "signal-desktop"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + services.xserver.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.signal-desktop ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + startAll; + $machine->waitForX; + + # start signal desktop + $machine->execute("su - alice -c signal-desktop &"); + + # wait for the "Link your phone to Signal Desktop" message + $machine->waitForText(qr/Link your phone to Signal Desktop/); + $machine->screenshot("signal_desktop"); + ''; +}) diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix new file mode 100644 index 0000000000000..811a466ff9414 --- /dev/null +++ b/nixos/tests/syncthing-init.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ lib, pkgs, ... }: let + + testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + +in { + name = "syncthing-init"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ]; + + machine = { + services.syncthing = { + enable = true; + declarative = { + devices.testDevice = { + id = testId; + }; + folders.testFolder = { + path = "/tmp/test"; + devices = [ "testDevice" ]; + }; + }; + }; + }; + + testScript = '' + $machine->waitForUnit("syncthing-init.service"); + $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /${testId}/ or die; + $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /testFolder/ or die; + ''; +}) + diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 6d6db6b0ea970..4d3bc28cd349f 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -12,6 +12,12 @@ import ./make-test.nix ({ pkgs, ...} : { enable = true; enableContribAndExtras = true; extraPackages = with pkgs.haskellPackages; haskellPackages: [ xmobar ]; + config = '' + import XMonad + import XMonad.Util.EZConfig + main = launch $ def `additionalKeysP` myKeys + myKeys = [ ("M-C-x", spawn "xterm") ] + ''; }; }; @@ -19,6 +25,10 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->sendKeys("alt-ctrl-x"); + $machine->waitForWindow(qr/machine.*alice/); + $machine->sleep(1); + $machine->screenshot("terminal"); $machine->waitUntilSucceeds("xmonad --restart"); $machine->sleep(3); $machine->sendKeys("alt-shift-ret"); diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b844c441bbc08..ed3f691122ce8 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.0"; - sha256 = "1dsckybjg2cvrvcs1bya03xymcm0whfxcb1v0vljn5pghyazgvhx"; - cargoSha256 = "0z7dmzpqg0qnkga7r4ykwrvz8ds1k9ik7cx58h2vnmhrhrddvizr"; + version = "2.5.1"; + sha256 = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d"; + cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index d01ef9ad059ec..18e3dd4129e4a 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.5"; - sha256 = "02ajwjw6cz86x6zybvw5l0pgv7r370hickjv9ja141w7bhl70q3v"; - cargoSha256 = "1n218c43gf200xlb3q03bd6w4kas0jsqx6ciw9s6h7h18wwibvf1"; + version = "2.4.6"; + sha256 = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z"; + cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 3b12ffe3463fb..b685fda7683dc 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "089kz6hgqg0caz33sps19wpkfnza5gf7brdq2p9y6bnwkipw1w9f"; + sha256 = "0cf7fr1qhyyylj8g9ax1rq5sb887bcv5b8d7hwlcfwamzxqpliyc"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix new file mode 100644 index 0000000000000..af29c3dc9e0e1 --- /dev/null +++ b/pkgs/applications/audio/carla/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, fftw, jack2, + liblo, libpulseaudio, libsndfile, makeWrapper, pkgconfig, python3Packages, + which, withFrontend ? true, + withQt ? true, qtbase ? null, + withGtk2 ? true, gtk2 ? null, + withGtk3 ? true, gtk3 ? null }: + +with stdenv.lib; + +assert withFrontend -> python3Packages ? pyqt5; +assert withQt -> qtbase != null; +assert withGtk2 -> gtk2 != null; +assert withGtk3 -> gtk3 != null; + +stdenv.mkDerivation rec { + pname = "carla"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "falkTX"; + repo = pname; + rev = "v${version}"; + sha256 = "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython pkgconfig which ]; + + pythonPath = with python3Packages; [ + rdflib pyliblo + ] ++ optional withFrontend pyqt5; + + buildInputs = [ + file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile + ] ++ pythonPath + ++ optional withQt qtbase + ++ optional withGtk2 gtk2 + ++ optional withGtk3 gtk3; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + # Also sets program_PYTHONPATH and program_PATH variables + wrapPythonPrograms + + find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do + patchPythonScript "$f" + done + patchPythonScript "$out/share/carla/carla_settings.py" + + for program in $out/bin/*; do + wrapProgram "$program" \ + --prefix PATH : "$program_PATH:${which}/bin" \ + --set PYTHONNOUSERSITE true \ + --prefix QT_PLUGIN_PATH : "${qtbase.bin}/${qtbase.qtPluginPrefix}" + done + ''; + + meta = with stdenv.lib; { + homepage = http://kxstudio.sf.net/carla; + description = "An audio plugin host"; + longDescription = '' + It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3 + and AU plugin formats, plus GIG, SF2 and SFZ file support. + It uses JACK as the default and preferred audio driver but also + supports native drivers like ALSA, DirectSound or CoreAudio. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.minijackson ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index ea83a1012ebb2..3ed330cc74379 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,9 +1,35 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg -, libvorbis, libmpc, libsndfile, libjack2, db, libmodplug, timidity, libid3tag -, libtool +{ stdenv, fetchurl, pkgconfig +, ncurses, db , popt, libtool +# Sound sub-systems +, alsaSupport ? true, alsaLib +, pulseSupport ? true, libpulseaudio, autoreconfHook +, jackSupport ? true, libjack2 +, ossSupport ? true +# Audio formats +, aacSupport ? true, faad2, libid3tag +, flacSupport ? true, flac +, midiSupport ? true, timidity +, modplugSupport ? true, libmodplug +, mp3Support ? true, libmad +, musepackSupport ? true, libmpc, libmpcdec, taglib +, vorbisSupport ? true, libvorbis +, speexSupport ? true, speex +, ffmpegSupport ? true, ffmpeg +, sndfileSupport ? true, libsndfile +, wavpackSupport ? true, wavpack +# Misc +, withffmpeg4 ? false, ffmpeg_4 +, curlSupport ? true, curl +, samplerateSupport ? true, libsamplerate +, withDebug ? false }: -stdenv.mkDerivation rec { +let + opt = stdenv.lib.optional; + mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; + +in stdenv.mkDerivation rec { + name = "moc-${version}"; version = "2.5.2"; @@ -12,18 +38,67 @@ stdenv.mkDerivation rec { sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [] + ++ opt withffmpeg4 ./moc-ffmpeg4.patch + ++ opt pulseSupport ./pulseaudio.patch; + + nativeBuildInputs = [ pkgconfig ] + ++ opt pulseSupport autoreconfHook; + + buildInputs = [ ncurses db popt libtool ] + # Sound sub-systems + ++ opt alsaSupport alsaLib + ++ opt pulseSupport libpulseaudio + ++ opt jackSupport libjack2 + # Audio formats + ++ opt (aacSupport || mp3Support) libid3tag + ++ opt aacSupport faad2 + ++ opt flacSupport flac + ++ opt midiSupport timidity + ++ opt modplugSupport libmodplug + ++ opt mp3Support libmad + ++ opt musepackSupport [ libmpc libmpcdec taglib ] + ++ opt vorbisSupport libvorbis + ++ opt speexSupport speex + ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg + ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 + ++ opt sndfileSupport libsndfile + ++ opt wavpackSupport wavpack + # Misc + ++ opt curlSupport curl + ++ opt samplerateSupport libsamplerate; - buildInputs = [ - ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2 - db libmodplug timidity libid3tag libtool + configureFlags = [ + # Sound sub-systems + (mkFlag alsaSupport "alsa") + (mkFlag pulseSupport "pulse") + (mkFlag jackSupport "jack") + (mkFlag ossSupport "oss") + # Audio formats + (mkFlag aacSupport "aac") + (mkFlag flacSupport "flac") + (mkFlag midiSupport "timidity") + (mkFlag modplugSupport "modplug") + (mkFlag mp3Support "mp3") + (mkFlag musepackSupport "musepack") + (mkFlag vorbisSupport "vorbis") + (mkFlag speexSupport "speex") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag sndfileSupport "sndfile") + (mkFlag wavpackSupport "wavpack") + # Misc + (mkFlag curlSupport "curl") + (mkFlag samplerateSupport "samplerate") + ("--enable-debug=" + (if withDebug then "yes" else "no")) + "--disable-cache" + "--without-rcc" ]; meta = with stdenv.lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = licenses.gpl2; - maintainers = with maintainers; [ pSub jagajaga ]; + maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/moc/moc-ffmpeg4.patch b/pkgs/applications/audio/moc/moc-ffmpeg4.patch new file mode 100644 index 0000000000000..7499f9c539bcd --- /dev/null +++ b/pkgs/applications/audio/moc/moc-ffmpeg4.patch @@ -0,0 +1,33 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963) ++++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo) +@@ -697,7 +697,7 @@ + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -705,8 +705,8 @@ + } + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) + { +@@ -725,7 +725,7 @@ + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); diff --git a/pkgs/applications/audio/moc/pulseaudio.patch b/pkgs/applications/audio/moc/pulseaudio.patch new file mode 100644 index 0000000000000..37d81dddf2bcb --- /dev/null +++ b/pkgs/applications/audio/moc/pulseaudio.patch @@ -0,0 +1,800 @@ +diff --git a/audio.c b/audio.c +--- a/audio.c ++++ b/audio.c +@@ -32,6 +32,9 @@ + #include "log.h" + #include "lists.h" + ++#ifdef HAVE_PULSE ++# include "pulse.h" ++#endif + #ifdef HAVE_OSS + # include "oss.h" + #endif +@@ -893,6 +896,15 @@ + } + #endif + ++#ifdef HAVE_PULSE ++ if (!strcasecmp(name, "pulseaudio")) { ++ pulse_funcs (funcs); ++ printf ("Trying PulseAudio...\n"); ++ if (funcs->init(&hw_caps)) ++ return; ++ } ++#endif ++ + #ifdef HAVE_OSS + if (!strcasecmp(name, "oss")) { + oss_funcs (funcs); +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -162,6 +162,21 @@ + AC_MSG_ERROR([BerkeleyDB (libdb) not found.])) + fi + ++AC_ARG_WITH(pulse, AS_HELP_STRING(--without-pulse, ++ Compile without PulseAudio support.)) ++ ++if test "x$with_pulse" != "xno" ++then ++ PKG_CHECK_MODULES(PULSE, [libpulse], ++ [SOUND_DRIVERS="$SOUND_DRIVERS PULSE" ++ EXTRA_OBJS="$EXTRA_OBJS pulse.o" ++ AC_DEFINE([HAVE_PULSE], 1, [Define if you have PulseAudio.]) ++ EXTRA_LIBS="$EXTRA_LIBS $PULSE_LIBS" ++ CFLAGS="$CFLAGS $PULSE_CFLAGS"], ++ [true]) ++fi ++ ++ + AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss], + [Compile without OSS support])) + +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -572,10 +572,11 @@ + + #ifdef OPENBSD + add_list ("SoundDriver", "SNDIO:JACK:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); ++ + #else + add_list ("SoundDriver", "Jack:ALSA:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); + #endif + + add_str ("JackClientName", "moc", CHECK_NONE); +diff --git a/pulse.c b/pulse.c +new file mode 100644 +--- /dev/null ++++ b/pulse.c +@@ -0,0 +1,705 @@ ++/* ++ * MOC - music on console ++ * Copyright (C) 2011 Marien Zwart <marienz@marienz.net> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ */ ++ ++/* PulseAudio backend. ++ * ++ * FEATURES: ++ * ++ * Does not autostart a PulseAudio server, but uses an already-started ++ * one, which should be better than alsa-through-pulse. ++ * ++ * Supports control of either our stream's or our entire sink's volume ++ * while we are actually playing. Volume control while paused is ++ * intentionally unsupported: the PulseAudio documentation strongly ++ * suggests not passing in an initial volume when creating a stream ++ * (allowing the server to track this instead), and we do not know ++ * which sink to control if we do not have a stream open. ++ * ++ * IMPLEMENTATION: ++ * ++ * Most client-side (resource allocation) errors are fatal. Failure to ++ * create a server context or stream is not fatal (and MOC should cope ++ * with these failures too), but server communication failures later ++ * on are currently not handled (MOC has no great way for us to tell ++ * it we no longer work, and I am not sure if attempting to reconnect ++ * is worth it or even a good idea). ++ * ++ * The pulse "simple" API is too simple: it combines connecting to the ++ * server and opening a stream into one operation, while I want to ++ * connect to the server when MOC starts (and fall back to a different ++ * backend if there is no server), and I cannot open a stream at that ++ * time since I do not know the audio format yet. ++ * ++ * PulseAudio strongly recommends we use a high-latency connection, ++ * which the MOC frontend code might not expect from its audio ++ * backend. We'll see. ++ * ++ * We map MOC's percentage volumes linearly to pulse's PA_VOLUME_MUTED ++ * (0) .. PA_VOLUME_NORM range. This is what the PulseAudio docs recommend ++ * ( http://pulseaudio.org/wiki/WritingVolumeControlUIs ). It does mean ++ * PulseAudio volumes above PA_VOLUME_NORM do not work well with MOC. ++ * ++ * Comments in audio.h claim "All functions are executed only by one ++ * thread" (referring to the function in the hw_funcs struct). This is ++ * a blatant lie. Most of them are invoked off the "output buffer" ++ * thread (out_buf.c) but at least the "playing" thread (audio.c) ++ * calls audio_close which calls our close function. We can mostly ++ * ignore this problem because we serialize on the pulseaudio threaded ++ * mainloop lock. But it does mean that functions that are normally ++ * only called between open and close (like reset) are sometimes ++ * called without us having a stream. Bulletproof, therefore: ++ * serialize setting/unsetting our global stream using the threaded ++ * mainloop lock, and check for that stream being non-null before ++ * using it. ++ * ++ * I am not convinced there are no further dragons lurking here: can ++ * the "playing" thread(s) close and reopen our output stream while ++ * the "output buffer" thread is sending output there? We can bail if ++ * our stream is simply closed, but we do not currently detect it ++ * being reopened and no longer using the same sample format, which ++ * might have interesting results... ++ * ++ * Also, read_mixer is called from the main server thread (handling ++ * commands). This crashed me once when it got at a stream that was in ++ * the "creating" state and therefore did not have a valid stream ++ * index yet. Fixed by only assigning to the stream global when the ++ * stream is valid. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#define DEBUG ++ ++#include <pulse/pulseaudio.h> ++#include "common.h" ++#include "log.h" ++#include "audio.h" ++ ++ ++/* The pulse mainloop and context are initialized in pulse_init and ++ * destroyed in pulse_shutdown. ++ */ ++static pa_threaded_mainloop *mainloop = NULL; ++static pa_context *context = NULL; ++ ++/* The stream is initialized in pulse_open and destroyed in pulse_close. */ ++static pa_stream *stream = NULL; ++ ++static int showing_sink_volume = 0; ++ ++/* Callbacks that do nothing but wake up the mainloop. */ ++ ++static void context_state_callback (pa_context *context ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_state_callback (pa_stream *stream ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_write_callback (pa_stream *stream ATTR_UNUSED, ++ size_t nbytes ATTR_UNUSED, void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++/* Initialize pulse mainloop and context. Failure to connect to the ++ * pulse daemon is nonfatal, everything else is fatal (as it ++ * presumably means we ran out of resources). ++ */ ++static int pulse_init (struct output_driver_caps *caps) ++{ ++ pa_context *c; ++ pa_proplist *proplist; ++ ++ assert (!mainloop); ++ assert (!context); ++ ++ mainloop = pa_threaded_mainloop_new (); ++ if (!mainloop) ++ fatal ("Cannot create PulseAudio mainloop"); ++ ++ if (pa_threaded_mainloop_start (mainloop) < 0) ++ fatal ("Cannot start PulseAudio mainloop"); ++ ++ /* TODO: possibly add more props. ++ * ++ * There are a few we could set in proplist.h but nothing I ++ * expect to be very useful. ++ * ++ * http://pulseaudio.org/wiki/ApplicationProperties recommends ++ * setting at least application.name, icon.name and media.role. ++ * ++ * No need to set application.name here, the name passed to ++ * pa_context_new_with_proplist overrides it. ++ */ ++ proplist = pa_proplist_new (); ++ if (!proplist) ++ fatal ("Cannot allocate PulseAudio proplist"); ++ ++ pa_proplist_sets (proplist, ++ PA_PROP_APPLICATION_VERSION, PACKAGE_VERSION); ++ pa_proplist_sets (proplist, PA_PROP_MEDIA_ROLE, "music"); ++ pa_proplist_sets (proplist, PA_PROP_APPLICATION_ID, "net.daper.moc"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ c = pa_context_new_with_proplist ( ++ pa_threaded_mainloop_get_api (mainloop), ++ PACKAGE_NAME, proplist); ++ pa_proplist_free (proplist); ++ ++ if (!c) ++ fatal ("Cannot allocate PulseAudio context"); ++ ++ pa_context_set_state_callback (c, context_state_callback, mainloop); ++ ++ /* Ignore return value, rely on state being set properly */ ++ pa_context_connect (c, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL); ++ ++ while (1) { ++ pa_context_state_t state = pa_context_get_state (c); ++ ++ if (state == PA_CONTEXT_READY) ++ break; ++ ++ if (!PA_CONTEXT_IS_GOOD (state)) { ++ error ("PulseAudio connection failed: %s", ++ pa_strerror (pa_context_errno (c))); ++ ++ goto unlock_and_fail; ++ } ++ ++ debug ("waiting for context to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global now that the context is actually ready */ ++ context = c; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ /* We just make up the hardware capabilities, since pulse is ++ * supposed to be abstracting these out. Assume pulse will ++ * deal with anything we want to throw at it, and that we will ++ * only want mono or stereo audio. ++ */ ++ caps->min_channels = 1; ++ caps->max_channels = 2; ++ caps->formats = (SFMT_S8 | SFMT_S16 | SFMT_S32 | ++ SFMT_FLOAT | SFMT_BE | SFMT_LE); ++ ++ return 1; ++ ++unlock_and_fail: ++ ++ pa_context_unref (c); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++ ++ return 0; ++} ++ ++static void pulse_shutdown (void) ++{ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_context_disconnect (context); ++ pa_context_unref (context); ++ context = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++} ++ ++static int pulse_open (struct sound_params *sound_params) ++{ ++ pa_sample_spec ss; ++ pa_buffer_attr ba; ++ pa_stream *s; ++ ++ assert (!stream); ++ /* Initialize everything to -1, which in practice gets us ++ * about 2 seconds of latency (which is fine). This is not the ++ * same as passing NULL for this struct, which gets us an ++ * unnecessarily short alsa-like latency. ++ */ ++ ba.fragsize = (uint32_t) -1; ++ ba.tlength = (uint32_t) -1; ++ ba.prebuf = (uint32_t) -1; ++ ba.minreq = (uint32_t) -1; ++ ba.maxlength = (uint32_t) -1; ++ ++ ss.channels = sound_params->channels; ++ ss.rate = sound_params->rate; ++ switch (sound_params->fmt) { ++ case SFMT_U8: ++ ss.format = PA_SAMPLE_U8; ++ break; ++ case SFMT_S16 | SFMT_LE: ++ ss.format = PA_SAMPLE_S16LE; ++ break; ++ case SFMT_S16 | SFMT_BE: ++ ss.format = PA_SAMPLE_S16BE; ++ break; ++ case SFMT_FLOAT | SFMT_LE: ++ ss.format = PA_SAMPLE_FLOAT32LE; ++ break; ++ case SFMT_FLOAT | SFMT_BE: ++ ss.format = PA_SAMPLE_FLOAT32BE; ++ break; ++ case SFMT_S32 | SFMT_LE: ++ ss.format = PA_SAMPLE_S32LE; ++ break; ++ case SFMT_S32 | SFMT_BE: ++ ss.format = PA_SAMPLE_S32BE; ++ break; ++ ++ default: ++ fatal ("pulse: got unrequested format"); ++ } ++ ++ debug ("opening stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* TODO: figure out if there are useful stream properties to set. ++ * ++ * I do not really see any in proplist.h that we can set from ++ * here (there are media title/artist/etc props but we do not ++ * have that data available here). ++ */ ++ s = pa_stream_new (context, "music", &ss, NULL); ++ if (!s) ++ fatal ("pulse: stream allocation failed"); ++ ++ pa_stream_set_state_callback (s, stream_state_callback, mainloop); ++ pa_stream_set_write_callback (s, stream_write_callback, mainloop); ++ ++ /* Ignore return value, rely on failed stream state instead. */ ++ pa_stream_connect_playback ( ++ s, NULL, &ba, ++ PA_STREAM_INTERPOLATE_TIMING | ++ PA_STREAM_AUTO_TIMING_UPDATE | ++ PA_STREAM_ADJUST_LATENCY, ++ NULL, NULL); ++ ++ while (1) { ++ pa_stream_state_t state = pa_stream_get_state (s); ++ ++ if (state == PA_STREAM_READY) ++ break; ++ ++ if (!PA_STREAM_IS_GOOD (state)) { ++ error ("PulseAudio stream connection failed"); ++ ++ goto fail; ++ } ++ ++ debug ("waiting for stream to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global stream now that it is actually ready */ ++ stream = s; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return 1; ++ ++fail: ++ pa_stream_unref (s); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ return 0; ++} ++ ++static void pulse_close (void) ++{ ++ debug ("closing stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_stream_disconnect (stream); ++ pa_stream_unref (stream); ++ stream = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_play (const char *buff, const size_t size) ++{ ++ size_t offset = 0; ++ ++ debug ("Got %d bytes to play", (int)size); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* The buffer is usually writable when we get here, and there ++ * are usually few (if any) writes after the first one. So ++ * there is no point in doing further writes directly from the ++ * callback: we can just do all writes from this thread. ++ */ ++ ++ /* Break out of the loop if some other thread manages to close ++ * our stream underneath us. ++ */ ++ while (stream) { ++ size_t towrite = MIN(pa_stream_writable_size (stream), ++ size - offset); ++ debug ("writing %d bytes", (int)towrite); ++ ++ /* We have no working way of dealing with errors ++ * (see below). */ ++ if (pa_stream_write(stream, buff + offset, towrite, ++ NULL, 0, PA_SEEK_RELATIVE)) ++ error ("pa_stream_write failed"); ++ ++ offset += towrite; ++ ++ if (offset >= size) ++ break; ++ ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("Done playing!"); ++ ++ /* We should always return size, calling code does not deal ++ * well with anything else. Only read the rest if you want to ++ * know why. ++ * ++ * The output buffer reader thread (out_buf.c:read_thread) ++ * repeatedly loads some 64k/0.1s of audio into a buffer on ++ * the stack, then calls audio_send_pcm repeatedly until this ++ * entire buffer has been processed (similar to the loop in ++ * this function). audio_send_pcm applies the softmixer and ++ * equalizer, then feeds the result to this function, passing ++ * through our return value. ++ * ++ * So if we return less than size the equalizer/softmixer is ++ * re-applied to the remaining data, which is silly. Also, ++ * audio_send_pcm checks for our return value being zero and ++ * calls fatal() if it is, so try to always process *some* ++ * data. Also, out_buf.c uses the return value of this ++ * function from the last run through its inner loop to update ++ * its time attribute, which means it will be interestingly ++ * off if that loop ran more than once. ++ * ++ * Oh, and alsa.c seems to think it can return -1 to indicate ++ * failure, which will cause out_buf.c to rewind its buffer ++ * (to before its start, usually). ++ */ ++ return size; ++} ++ ++static void volume_cb (const pa_cvolume *v, void *userdata) ++{ ++ int *result = userdata; ++ ++ if (v) ++ *result = 100 * pa_cvolume_avg (v) / PA_VOLUME_NORM; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static void sink_input_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata ATTR_UNUSED) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static int pulse_read_mixer (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("read mixer"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_volume_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_volume_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_set_mixer (int vol) ++{ ++ pa_cvolume v; ++ pa_operation *op; ++ ++ /* Setting volume for one channel does the right thing. */ ++ pa_cvolume_set(&v, 1, vol * PA_VOLUME_NORM / 100); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_set_sink_volume_by_index ( ++ context, pa_stream_get_device_index (stream), ++ &v, NULL, NULL); ++ else ++ op = pa_context_set_sink_input_volume ( ++ context, pa_stream_get_index (stream), ++ &v, NULL, NULL); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_get_buff_fill (void) ++{ ++ /* This function is problematic. MOC uses it to for the "time ++ * remaining" in the UI, but calls it more than once per ++ * second (after each chunk of audio played, not for each ++ * playback time update). We have to be fairly accurate here ++ * for that time remaining to not jump weirdly. But PulseAudio ++ * cannot give us a 100% accurate value here, as it involves a ++ * server roundtrip. And if we call this a lot it suggests ++ * switching to a mode where the value is interpolated, making ++ * it presumably more inaccurate (see the flags we pass to ++ * pa_stream_connect_playback). ++ * ++ * MOC also contains what I believe to be a race: it calls ++ * audio_get_buff_fill "soon" (after playing the first chunk) ++ * after starting playback of the next song, at which point we ++ * still have part of the previous song buffered. This means ++ * our position into the new song is negative, which fails an ++ * assert (in out_buf.c:out_buf_time_get). There is no sane ++ * way for us to detect this condition. I believe no other ++ * backend triggers this because the assert sits after an ++ * implicit float -> int seconds conversion, which means we ++ * have to be off by at least an entire second to get a ++ * negative value, and none of the other backends have buffers ++ * that large (alsa buffers are supposedly a few 100 ms). ++ */ ++ pa_usec_t buffered_usecs = 0; ++ int buffered_bytes = 0; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* Using pa_stream_get_timing_info and returning the distance ++ * between write_index and read_index would be more obvious, ++ * but because of how the result is actually used I believe ++ * using the latency value is slightly more correct, and it ++ * makes the following crash-avoidance hack more obvious. ++ */ ++ ++ /* This function will frequently fail the first time we call ++ * it (pulse does not have the requested data yet). We ignore ++ * that and just return 0. ++ * ++ * Deal with stream being NULL too, just in case this is ++ * called in a racy fashion similar to how reset() is. ++ */ ++ if (stream && ++ pa_stream_get_latency (stream, &buffered_usecs, NULL) >= 0) { ++ /* Crash-avoidance HACK: floor our latency to at most ++ * 1 second. It is usually more, but reporting that at ++ * the start of playback crashes MOC, and we cannot ++ * sanely detect when reporting it is safe. ++ */ ++ if (buffered_usecs > 1000000) ++ buffered_usecs = 1000000; ++ ++ buffered_bytes = pa_usec_to_bytes ( ++ buffered_usecs, ++ pa_stream_get_sample_spec (stream)); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("buffer fill: %d usec / %d bytes", ++ (int) buffered_usecs, (int) buffered_bytes); ++ ++ return buffered_bytes; ++} ++ ++static void flush_callback (pa_stream *s ATTR_UNUSED, int success, ++ void *userdata) ++{ ++ int *result = userdata; ++ ++ *result = success; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static int pulse_reset (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("reset requested"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* We *should* have a stream here, but MOC is racy, so bulletproof */ ++ if (stream) { ++ op = pa_stream_flush (stream, flush_callback, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } else ++ logit ("pulse_reset() called without a stream"); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static int pulse_get_rate (void) ++{ ++ /* This is called once right after open. Do not bother making ++ * this fast. */ ++ ++ int result; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) ++ result = pa_stream_get_sample_spec (stream)->rate; ++ else { ++ error ("get_rate called without a stream"); ++ result = 0; ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_toggle_mixer_channel (void) ++{ ++ showing_sink_volume = !showing_sink_volume; ++} ++ ++static void sink_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_input_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static char *pulse_get_mixer_channel_name (void) ++{ ++ char *result = NULL; ++ pa_operation *op; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_name_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_name_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ if (!result) ++ result = xstrdup ("disconnected"); ++ ++ return result; ++} ++ ++void pulse_funcs (struct hw_funcs *funcs) ++{ ++ funcs->init = pulse_init; ++ funcs->shutdown = pulse_shutdown; ++ funcs->open = pulse_open; ++ funcs->close = pulse_close; ++ funcs->play = pulse_play; ++ funcs->read_mixer = pulse_read_mixer; ++ funcs->set_mixer = pulse_set_mixer; ++ funcs->get_buff_fill = pulse_get_buff_fill; ++ funcs->reset = pulse_reset; ++ funcs->get_rate = pulse_get_rate; ++ funcs->toggle_mixer_channel = pulse_toggle_mixer_channel; ++ funcs->get_mixer_channel_name = pulse_get_mixer_channel_name; ++} +diff --git a/pulse.h b/pulse.h +new file mode 100644 +--- /dev/null ++++ b/pulse.h +@@ -0,0 +1,14 @@ ++#ifndef PULSE_H ++#define PULSE_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void pulse_funcs (struct hw_funcs *funcs); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 081c4ab41acb4..ddbefd129ffe3 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { else releasePath else if stdenv.hostPlatform.system == "i686-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix new file mode 100644 index 0000000000000..fbd0f3c5def3d --- /dev/null +++ b/pkgs/applications/audio/sfxr/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetchurl +, pkgconfig +, desktop-file-utils +, SDL +, gtk3 +, gsettings-desktop-schemas +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "sfxr"; + version = "1.2.1"; + + src = fetchurl { + url = "http://www.drpetter.se/files/sfxr-sdl-${version}.tar.gz"; + sha256 = "0dfqgid6wzzyyhc0ha94prxax59wx79hqr25r6if6by9cj4vx4ya"; + }; + + postPatch = '' + substituteInPlace Makefile --replace "usr/" "" + substituteInPlace sdlkit.h --replace \ + "/usr/share/sfxr/sfxr.bmp" \ + "$out/share/sfxr/sfxr.bmp" + substituteInPlace main.cpp \ + --replace \ + "/usr/share/sfxr/font.tga" \ + "$out/share/sfxr/font.tga" \ + --replace \ + "/usr/share/sfxr/ld48.tga" \ + "$out/share/sfxr/ld48.tga" + ''; + + nativeBuildInputs = [ + pkgconfig + desktop-file-utils + ]; + + buildInputs = [ + SDL + gtk3 + gsettings-desktop-schemas + wrapGAppsHook + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://www.drpetter.se/project_sfxr.html"; + description = "A videogame sound effect generator"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 85687090721d7..61d65cb64b6ba 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lightdm"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "CanonicalLtd"; repo = pname; rev = version; - sha256 = "1mmqy1jdvgc0h0h9gli7n4vdv5p8m5019qjr5ni4h73iz6mjdj2b"; + sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d53ccb1fdbd16..af5adca20ed8a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = latestVersion; latestVersion = { # canary & dev - version = "3.5.0.13"; # "Android Studio 3.5 Beta 1" - build = "191.5529924"; - sha256Hash = "0i710n2wr0a8lvxf1mg6a5pmdh1l72wa0hwyricyixi0mylwwc6l"; + version = "3.5.0.14"; # "Android Studio 3.5 Beta 2" + build = "191.5549111"; + sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 89e10ea25fa62..76e00edaa04d6 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ with qt5; stdenv.mkDerivation rec { - version = "0.9.4"; + version = "0.10.0"; name = "featherpad-${version}"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "18zna6rx2qyiplr44wrkvr4avk9yy2l1s23fy3d7ql9f1fq12z3w"; + sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 86fb972e94c3b..27c956dcd14ee 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,43 +1,49 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost -, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, qtxmlpatterns, libuuid -, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel +, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +, llvmPackages }: let verMajor = "1"; - verMinor = "1"; - verPatch = "463"; + verMinor = "2"; + verPatch = "1335"; version = "${verMajor}.${verMinor}.${verPatch}"; - ginVer = "1.5"; - gwtVer = "2.7.0"; + ginVer = "2.1.2"; + gwtVer = "2.8.1"; in stdenv.mkDerivation rec { name = "RStudio-${version}"; nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel - qtxmlpatterns libuuid ]; + buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors + qtwebengine qtwebchannel libuuid ]; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6"; + sha256 = "0jv1d4yznv2lzwp0fdf377vqpg0k2q4z9qvji4sj86fabj835lqd"; }; - # Hack RStudio to only use the input R. - patches = [ ./r-location.patch ]; - postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + # Hack RStudio to only use the input R and provided libclang. + patches = [ ./r-location.patch ./clang-location.patch ]; + postPatch = '' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ + --replace '@clang@' ${llvmPackages.clang.cc} \ + --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so + ''; ginSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; }; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; + sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); @@ -47,14 +53,11 @@ stdenv.mkDerivation rec { sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rstudiolibclang = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip; - sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c"; - }; - - rstudiolibclangheaders = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/libclang-builtin-headers.zip; - sha256 = "0x4ax186bm3kf098izwmsplckgx1kqzg9iiyzg95rpbqsb4593qb"; + rsconnectSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rsconnect"; + rev = "984745d8"; + sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; }; preConfigure = @@ -80,13 +83,14 @@ stdenv.mkDerivation rec { done unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - mkdir -p dependencies/common/libclang/3.5 - unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5 - mkdir -p dependencies/common/libclang/builtin-headers - unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers mkdir -p dependencies/common/pandoc cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ + + cp -r ${rsconnectSrc} dependencies/common/rsconnect + pushd dependencies/common + ${R}/bin/R CMD build -d --no-build-vignettes rsconnect + popd ''; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix deleted file mode 100644 index 55c83ca85a643..0000000000000 --- a/pkgs/applications/editors/rstudio/preview.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel -, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc -, llvmPackages -}: - -let - rev = "f79330d4"; - ginVer = "2.1.2"; - gwtVer = "2.8.1"; -in -stdenv.mkDerivation rec { - name = "RStudio-preview-${rev}"; - - nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - - buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors - qtwebengine qtwebchannel libuuid ]; - - src = fetchFromGitHub { - owner = "rstudio"; - repo = "rstudio"; - inherit rev; - sha256 = "0v3vzqjp74c3m4h9l6w2lrdnjqaimdjzbf7vhnlxj2qa0lwsnykb"; - }; - - # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@clang@' ${llvmPackages.clang.cc} \ - --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so - ''; - - ginSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; - }; - - gwtSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; - }; - - hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); - - mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; - sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; - }; - - rsconnectSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rsconnect"; - rev = "984745d8"; - sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; - }; - - preConfigure = - '' - GWT_LIB_DIR=src/gwt/lib - - mkdir -p $GWT_LIB_DIR/gin/${ginVer} - unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - - unzip ${gwtSrc} - mkdir -p $GWT_LIB_DIR/gwt - mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} - - mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -sv $i dependencies/common/dictionaries/ - done - done - - unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - - mkdir -p dependencies/common/pandoc - cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ - - cp -r ${rsconnectSrc} dependencies/common/rsconnect - pushd dependencies/common - ${R}/bin/R CMD build -d --no-build-vignettes rsconnect - popd - ''; - - enableParallelBuilding = true; - - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; - - desktopItem = makeDesktopItem { - name = name; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio Preview"; - genericName = "IDE"; - comment = meta.description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; - }; - - postInstall = '' - wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin - mkdir $out/share - cp -r ${desktopItem}/share/applications $out/share - mkdir $out/share/icons - ln $out/rstudio.png $out/share/icons - ''; - - meta = with stdenv.lib; - { description = "Set of integrated tools for the R language"; - homepage = https://www.rstudio.com/; - license = licenses.agpl3; - maintainers = with maintainers; [ averelld ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index ebceb4a8b3526..b8fef39d3ea23 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -12,8 +12,8 @@ in } {}; sublime3 = common { - buildVersion = "3200"; - x32sha256 = "01krmbji8z62x4kl1hf3c1nfj4c4n4xmg1df62ljiwhkcfm74izr"; - x64sha256 = "1gagc50fqb0d2bszi8m5spzb64shkaylvrwl6fxah55xcmy2kmdr"; + buildVersion = "3207"; + x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy"; + x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc"; } {}; } diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 1cfb04b7b2ef9..4fa93d78235ec 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tiled"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "1zsfhw539zwyf5qfnirzkkgy5bmrrs2cry4gimrhpky9fjlaa9h8"; + sha256 = "18a0pkq8j20v1njrl0sswm0ch10c6c4fas7q9kk2d2fd610ga6gh"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b75d08787e8c..9fdbdba8e1888 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc { source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -130,8 +130,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/generic.nix index 04e084dfc3b30..10a981f59bfea 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,38 +2,18 @@ , unzip, libsecret, libXScrnSaver, wrapGAppsHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig -, isInsiders ? false }: -let - executableName = "code" + lib.optionalString isInsiders "-insiders"; - longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; - shortName = "Code" + lib.optionalString isInsiders " - Insiders"; +# Attributes inherit from specific versions +, version, src, meta, sourceRoot +, executableName, longName, shortName, pname +}: +let inherit (stdenv.hostPlatform) system; - - plat = { - "i686-linux" = "linux-ia32"; - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; - }.${system}; - - sha256 = { - "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; - "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; - "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; - }.${system}; - - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { - name = "vscode-${version}"; - version = "1.33.1"; - src = fetchurl { - name = "VSCode_${version}_${plat}.${archive_fmt}"; - url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; - inherit sha256; - }; + inherit pname version src sourceRoot; passthru = { inherit executableName; @@ -118,22 +98,5 @@ in gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]}) ''; - meta = with stdenv.lib; { - description = '' - Open source source code editor developed by Microsoft for Windows, - Linux and macOS - ''; - longDescription = '' - Open source source code editor developed by Microsoft for Windows, - Linux and macOS. It includes support for debugging, embedded Git - control, syntax highlighting, intelligent code completion, snippets, - and code refactoring. It is also customizable, so users can change the - editor's theme, keyboard shortcuts, and preferences - ''; - homepage = https://code.visualstudio.com/; - downloadPage = https://code.visualstudio.com/Updates; - license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; + inherit meta; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix new file mode 100644 index 0000000000000..4300abf626c32 --- /dev/null +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch, isInsiders ? false }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; + "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; + "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.33.1"; + pname = "vscode"; + + executableName = "code" + lib.optionalString isInsiders "-insiders"; + longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; + shortName = "Code" + lib.optionalString isInsiders " - Insiders"; + + src = fetchurl { + name = "VSCode_${version}_${plat}.${archive_fmt}"; + url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; + inherit sha256; + }; + + sourceRoot = ""; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS. It includes support for debugging, embedded Git + control, syntax highlighting, intelligent code completion, snippets, + and code refactoring. It is also customizable, so users can change the + editor's theme, keyboard shortcuts, and preferences + ''; + homepage = https://code.visualstudio.com/; + downloadPage = https://code.visualstudio.com/Updates; + license = licenses.unfree; + maintainers = with maintainers; [ eadwu synthetica ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix new file mode 100644 index 0000000000000..2b85cf8294ee0 --- /dev/null +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "c45be9ff32a5acef91befc85d545402daac5cef627fe8f17fea40ae387b35b22"; + "x86_64-linux" = "7a87f19bc48cbe017321c72da244d879a7da364b92b3a89b742d437ffcd585d3"; + "x86_64-darwin" = "e393be5dd82ea1900e3a0597b6cb2e4c924b6acda4297d9d3eff5abcc857f32c"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.33.1"; + pname = "vscodium"; + + executableName = "vscodium"; + longName = "VSCodium"; + shortName = "Codium"; + + src = fetchurl { + url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; + inherit sha256; + }; + + sourceRoot = "."; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS (VS Code without MS branding/telemetry/licensing) + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS. It includes support for debugging, embedded Git + control, syntax highlighting, intelligent code completion, snippets, + and code refactoring. It is also customizable, so users can change the + editor's theme, keyboard shortcuts, and preferences + ''; + homepage = https://github.com/VSCodium/vscodium; + downloadPage = https://github.com/VSCodium/vscodium/releases; + license = licenses.mit; + maintainers = with maintainers; []; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 5922206a8b9e6..ca3dac34dca57 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,30 +1,27 @@ { stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig +, double-conversion, lib3mf, libzip }: stdenv.mkDerivation rec { - version = "2018.04-git"; - name = "openscad-${version}"; + pname = "openscad"; + version = "2019.05"; -# src = fetchurl { -# url = "http://files.openscad.org/${name}.src.tar.gz"; -# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; -# }; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; - sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; + rev = "${pname}-${version}"; + sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib - harfbuzz gettext freetype fontconfig + harfbuzz lib3mf libzip double-conversion freetype fontconfig ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined - ++ (with qt5; [qtbase qmake] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) + ++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) ++ (with libsForQt5; [qscintilla]) ; @@ -33,8 +30,6 @@ stdenv.mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - doCheck = false; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications @@ -63,6 +58,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; - [ bjornfor raskin the-kenny ]; + [ bjornfor raskin the-kenny gebner ]; }; } diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch index 1b5e12c7ec324..24ed20fd83fb1 100644 --- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch +++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -38,12 +38,15 @@ index 75abede50..10f039376 100644 find_dependency(Boost "@Boost_MINIMUM_VERSION@") -@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) +@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") + + #################################################################################### + # CMAKE_AUTOMOC -- 2.15.1 diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 239d71fdfaf16..a2e10ee2c0285 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,7 +102,7 @@ let kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; - kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index e06c7f0d14aa4..bd96cb966933b 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ ) diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 2d902c220afcc..3cb89cb4daa64 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications, - kxmlgui, + gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit, + knotifications, kxmlgui, }: mkDerivation { @@ -13,6 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui + gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications + kxmlgui ]; } diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 2e43e946d7ff0..6ae45057f19e5 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, kio, libkexiv2, libkdcraw + extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw }: mkDerivation { @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kio libkexiv2 libkdcraw ]; + buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 9da12b248c568..a42210e6e4031 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -25,6 +25,9 @@ , qtquickcontrols , qtscript , qtwebkit +, rttr +, kpurpose +, kdeclarative }: mkDerivation { @@ -57,6 +60,9 @@ mkDerivation { shared-mime-info libv4l ffmpeg + rttr + kpurpose + kdeclarative ]; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch new file mode 100644 index 0000000000000..46722ff5fba01 --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch @@ -0,0 +1,12 @@ +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index 99f7dbf..03e953b 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -45,7 +45,6 @@ add_subdirectory( imap ) + if (Libkolabxml_FOUND) + add_subdirectory( kolab ) + endif() +-add_subdirectory( facebook ) + add_subdirectory( maildir ) + + add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index fa090d5035472..6d7bd0daa96b5 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -1,11 +1,11 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns + pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, }: mkDerivation { @@ -14,12 +14,13 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtspeech qtxmlpatterns + pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series new file mode 100644 index 0000000000000..cc3e104775fff --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/series @@ -0,0 +1 @@ +00-no-facebook.patch diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index dd717c9462d60..a7aa817576fb4 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -2,8 +2,8 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, - kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, - qtsvg, samba, solid, gperf + kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr, ilmbase, + openslp, phonon, qtsvg, samba, solid, gperf }: mkDerivation { @@ -16,7 +16,8 @@ mkDerivation { buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support - kpty libmtp libssh openexr openslp phonon qtsvg samba solid gperf + kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba + solid gperf ]; CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index acb200c59708c..a58b3b8c45d88 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -26,4 +26,5 @@ mkDerivation { libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; + patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch new file mode 100644 index 0000000000000..71a23be2d8391 --- /dev/null +++ b/pkgs/applications/kde/kmail.patch @@ -0,0 +1,24 @@ +diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt +index 48ed076..9c56896 100644 +--- a/agents/archivemailagent/CMakeLists.txt ++++ b/agents/archivemailagent/CMakeLists.txt +@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) + add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) + target_link_libraries(archivemailagent + KF5::MailCommon ++ KF5::Libkdepim + KF5::I18n + KF5::Notifications + KF5::IconThemes +diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt +index a56b730..83604cf 100644 +--- a/agents/followupreminderagent/CMakeLists.txt ++++ b/agents/followupreminderagent/CMakeLists.txt +@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent + KF5::AkonadiMime + KF5::AkonadiAgentBase + KF5::DBusAddons ++ KF5::FollowupReminder + KF5::XmlGui + KF5::KIOWidgets + KF5::Notifications diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 87204c1fe9fc2..89ac92bb47453 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, makeWrapper, kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, - libvncserver, freerdp + kwindowsystem, libvncserver, freerdp }: mkDerivation { @@ -10,7 +10,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons - freerdp libvncserver + kwindowsystem freerdp libvncserver ]; postFixup = '' wrapProgram $out/bin/krdc \ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 416273d719fe1..43deb08c39f5a 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz"; - sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658"; - name = "akonadi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz"; + sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc"; + name = "akonadi-19.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz"; - sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee"; - name = "akonadi-calendar-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz"; + sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48"; + name = "akonadi-calendar-19.04.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz"; - sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed"; - name = "akonadi-calendar-tools-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz"; + sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531"; + name = "akonadi-calendar-tools-19.04.1.tar.xz"; }; }; akonadiconsole = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz"; - sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0"; - name = "akonadiconsole-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz"; + sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262"; + name = "akonadiconsole-19.04.1.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz"; - sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc"; - name = "akonadi-contacts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz"; + sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc"; + name = "akonadi-contacts-19.04.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz"; - sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104"; - name = "akonadi-import-wizard-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz"; + sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7"; + name = "akonadi-import-wizard-19.04.1.tar.xz"; }; }; akonadi-mime = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz"; - sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4"; - name = "akonadi-mime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz"; + sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8"; + name = "akonadi-mime-19.04.1.tar.xz"; }; }; akonadi-notes = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz"; - sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60"; - name = "akonadi-notes-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz"; + sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277"; + name = "akonadi-notes-19.04.1.tar.xz"; }; }; akonadi-search = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz"; - sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346"; - name = "akonadi-search-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz"; + sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6"; + name = "akonadi-search-19.04.1.tar.xz"; }; }; akregator = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz"; - sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1"; - name = "akregator-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz"; + sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1"; + name = "akregator-19.04.1.tar.xz"; }; }; analitza = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz"; - sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"; - name = "analitza-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz"; + sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381"; + name = "analitza-19.04.1.tar.xz"; }; }; ark = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz"; - sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"; - name = "ark-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz"; + sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6"; + name = "ark-19.04.1.tar.xz"; }; }; artikulate = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz"; - sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278"; - name = "artikulate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz"; + sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432"; + name = "artikulate-19.04.1.tar.xz"; }; }; audiocd-kio = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz"; - sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8"; - name = "audiocd-kio-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz"; + sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98"; + name = "audiocd-kio-19.04.1.tar.xz"; }; }; baloo-widgets = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz"; - sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"; - name = "baloo-widgets-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz"; + sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6"; + name = "baloo-widgets-19.04.1.tar.xz"; }; }; blinken = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz"; - sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579"; - name = "blinken-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz"; + sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca"; + name = "blinken-19.04.1.tar.xz"; }; }; bomber = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz"; - sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771"; - name = "bomber-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz"; + sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe"; + name = "bomber-19.04.1.tar.xz"; }; }; bovo = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz"; - sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"; - name = "bovo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz"; + sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763"; + name = "bovo-19.04.1.tar.xz"; }; }; calendarsupport = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz"; - sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5"; - name = "calendarsupport-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz"; + sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535"; + name = "calendarsupport-19.04.1.tar.xz"; }; }; cantor = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz"; - sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398"; - name = "cantor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz"; + sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1"; + name = "cantor-19.04.1.tar.xz"; }; }; cervisia = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz"; - sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85"; - name = "cervisia-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz"; + sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b"; + name = "cervisia-19.04.1.tar.xz"; }; }; dolphin = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz"; - sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"; - name = "dolphin-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz"; + sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a"; + name = "dolphin-19.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz"; - sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"; - name = "dolphin-plugins-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz"; + sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105"; + name = "dolphin-plugins-19.04.1.tar.xz"; }; }; dragon = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz"; - sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"; - name = "dragon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz"; + sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8"; + name = "dragon-19.04.1.tar.xz"; }; }; eventviews = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz"; - sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0"; - name = "eventviews-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz"; + sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763"; + name = "eventviews-19.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz"; - sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338"; - name = "ffmpegthumbs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz"; + sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae"; + name = "ffmpegthumbs-19.04.1.tar.xz"; }; }; filelight = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz"; - sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"; - name = "filelight-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz"; + sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd"; + name = "filelight-19.04.1.tar.xz"; }; }; granatier = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz"; - sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"; - name = "granatier-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz"; + sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22"; + name = "granatier-19.04.1.tar.xz"; }; }; grantlee-editor = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz"; - sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c"; - name = "grantlee-editor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz"; + sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a"; + name = "grantlee-editor-19.04.1.tar.xz"; }; }; grantleetheme = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz"; - sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402"; - name = "grantleetheme-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz"; + sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b"; + name = "grantleetheme-19.04.1.tar.xz"; }; }; gwenview = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz"; - sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"; - name = "gwenview-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz"; + sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c"; + name = "gwenview-19.04.1.tar.xz"; }; }; incidenceeditor = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz"; - sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02"; - name = "incidenceeditor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz"; + sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58"; + name = "incidenceeditor-19.04.1.tar.xz"; }; }; juk = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz"; - sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca"; - name = "juk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz"; + sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51"; + name = "juk-19.04.1.tar.xz"; }; }; k3b = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz"; - sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e"; - name = "k3b-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz"; + sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942"; + name = "k3b-19.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz"; - sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce"; - name = "kaccounts-integration-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz"; + sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433"; + name = "kaccounts-integration-19.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz"; - sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6"; - name = "kaccounts-providers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz"; + sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011"; + name = "kaccounts-providers-19.04.1.tar.xz"; }; }; kaddressbook = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz"; - sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28"; - name = "kaddressbook-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz"; + sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd"; + name = "kaddressbook-19.04.1.tar.xz"; }; }; kajongg = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz"; - sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9"; - name = "kajongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz"; + sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475"; + name = "kajongg-19.04.1.tar.xz"; }; }; kalarm = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz"; - sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3"; - name = "kalarm-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz"; + sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd"; + name = "kalarm-19.04.1.tar.xz"; }; }; kalarmcal = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz"; - sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8"; - name = "kalarmcal-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz"; + sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646"; + name = "kalarmcal-19.04.1.tar.xz"; }; }; kalgebra = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz"; - sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"; - name = "kalgebra-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz"; + sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f"; + name = "kalgebra-19.04.1.tar.xz"; }; }; kalzium = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz"; - sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef"; - name = "kalzium-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz"; + sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5"; + name = "kalzium-19.04.1.tar.xz"; }; }; kamera = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz"; - sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f"; - name = "kamera-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz"; + sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f"; + name = "kamera-19.04.1.tar.xz"; }; }; kamoso = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz"; - sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3"; - name = "kamoso-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz"; + sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796"; + name = "kamoso-19.04.1.tar.xz"; }; }; kanagram = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz"; - sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204"; - name = "kanagram-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz"; + sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38"; + name = "kanagram-19.04.1.tar.xz"; }; }; kapman = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz"; - sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"; - name = "kapman-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz"; + sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400"; + name = "kapman-19.04.1.tar.xz"; }; }; kapptemplate = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz"; - sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f"; - name = "kapptemplate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz"; + sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3"; + name = "kapptemplate-19.04.1.tar.xz"; }; }; kate = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz"; - sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"; - name = "kate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz"; + sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f"; + name = "kate-19.04.1.tar.xz"; }; }; katomic = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz"; - sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"; - name = "katomic-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz"; + sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5"; + name = "katomic-19.04.1.tar.xz"; }; }; kbackup = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz"; - sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf"; - name = "kbackup-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz"; + sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f"; + name = "kbackup-19.04.1.tar.xz"; }; }; kblackbox = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz"; - sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b"; - name = "kblackbox-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz"; + sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431"; + name = "kblackbox-19.04.1.tar.xz"; }; }; kblocks = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz"; - sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"; - name = "kblocks-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz"; + sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390"; + name = "kblocks-19.04.1.tar.xz"; }; }; kblog = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz"; - sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc"; - name = "kblog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz"; + sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93"; + name = "kblog-19.04.1.tar.xz"; }; }; kbounce = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz"; - sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"; - name = "kbounce-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz"; + sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12"; + name = "kbounce-19.04.1.tar.xz"; }; }; kbreakout = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz"; - sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"; - name = "kbreakout-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz"; + sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad"; + name = "kbreakout-19.04.1.tar.xz"; }; }; kbruch = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz"; - sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d"; - name = "kbruch-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz"; + sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00"; + name = "kbruch-19.04.1.tar.xz"; }; }; kcachegrind = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz"; - sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"; - name = "kcachegrind-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz"; + sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2"; + name = "kcachegrind-19.04.1.tar.xz"; }; }; kcalc = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz"; - sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"; - name = "kcalc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz"; + sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91"; + name = "kcalc-19.04.1.tar.xz"; }; }; kcalcore = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz"; - sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452"; - name = "kcalcore-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz"; + sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9"; + name = "kcalcore-19.04.1.tar.xz"; }; }; kcalutils = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz"; - sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9"; - name = "kcalutils-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz"; + sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec"; + name = "kcalutils-19.04.1.tar.xz"; }; }; kcharselect = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz"; - sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb"; - name = "kcharselect-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz"; + sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec"; + name = "kcharselect-19.04.1.tar.xz"; }; }; kcolorchooser = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz"; - sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"; - name = "kcolorchooser-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz"; + sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a"; + name = "kcolorchooser-19.04.1.tar.xz"; }; }; kcontacts = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz"; - sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3"; - name = "kcontacts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz"; + sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088"; + name = "kcontacts-19.04.1.tar.xz"; }; }; kcron = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz"; - sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3"; - name = "kcron-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz"; + sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951"; + name = "kcron-19.04.1.tar.xz"; }; }; kdav = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz"; - sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23"; - name = "kdav-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz"; + sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737"; + name = "kdav-19.04.1.tar.xz"; }; }; kdebugsettings = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz"; - sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7"; - name = "kdebugsettings-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz"; + sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2"; + name = "kdebugsettings-19.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz"; - sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4"; - name = "kde-dev-scripts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz"; + sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2"; + name = "kde-dev-scripts-19.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz"; - sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6"; - name = "kde-dev-utils-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz"; + sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b"; + name = "kde-dev-utils-19.04.1.tar.xz"; }; }; kdeedu-data = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz"; - sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999"; - name = "kdeedu-data-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz"; + sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30"; + name = "kdeedu-data-19.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz"; - sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52"; - name = "kdegraphics-mobipocket-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz"; + sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821"; + name = "kdegraphics-mobipocket-19.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz"; - sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0"; - name = "kdegraphics-thumbnailers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz"; + sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e"; + name = "kdegraphics-thumbnailers-19.04.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz"; - sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503"; - name = "kdenetwork-filesharing-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz"; + sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd"; + name = "kdenetwork-filesharing-19.04.1.tar.xz"; }; }; kdenlive = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz"; - sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"; - name = "kdenlive-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz"; + sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5"; + name = "kdenlive-19.04.1.tar.xz"; }; }; kdepim-addons = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz"; - sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5"; - name = "kdepim-addons-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz"; + sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882"; + name = "kdepim-addons-19.04.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz"; - sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164"; - name = "kdepim-apps-libs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz"; + sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d"; + name = "kdepim-apps-libs-19.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz"; - sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3"; - name = "kdepim-runtime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz"; + sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744"; + name = "kdepim-runtime-19.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz"; - sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad"; - name = "kdesdk-kioslaves-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz"; + sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16"; + name = "kdesdk-kioslaves-19.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz"; - sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b"; - name = "kdesdk-thumbnailers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz"; + sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442"; + name = "kdesdk-thumbnailers-19.04.1.tar.xz"; }; }; kdf = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz"; - sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"; - name = "kdf-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz"; + sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5"; + name = "kdf-19.04.1.tar.xz"; }; }; kdialog = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz"; - sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212"; - name = "kdialog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz"; + sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a"; + name = "kdialog-19.04.1.tar.xz"; }; }; kdiamond = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz"; - sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"; - name = "kdiamond-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz"; + sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3"; + name = "kdiamond-19.04.1.tar.xz"; }; }; keditbookmarks = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz"; - sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d"; - name = "keditbookmarks-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz"; + sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db"; + name = "keditbookmarks-19.04.1.tar.xz"; }; }; kfind = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz"; - sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"; - name = "kfind-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz"; + sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd"; + name = "kfind-19.04.1.tar.xz"; }; }; kfloppy = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz"; - sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363"; - name = "kfloppy-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz"; + sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75"; + name = "kfloppy-19.04.1.tar.xz"; }; }; kfourinline = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz"; - sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce"; - name = "kfourinline-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz"; + sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973"; + name = "kfourinline-19.04.1.tar.xz"; }; }; kgeography = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz"; - sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9"; - name = "kgeography-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz"; + sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502"; + name = "kgeography-19.04.1.tar.xz"; }; }; kget = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz"; - sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86"; - name = "kget-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz"; + sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629"; + name = "kget-19.04.1.tar.xz"; }; }; kgoldrunner = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz"; - sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6"; - name = "kgoldrunner-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz"; + sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760"; + name = "kgoldrunner-19.04.1.tar.xz"; }; }; kgpg = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz"; - sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8"; - name = "kgpg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz"; + sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb"; + name = "kgpg-19.04.1.tar.xz"; }; }; khangman = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz"; - sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013"; - name = "khangman-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz"; + sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27"; + name = "khangman-19.04.1.tar.xz"; }; }; khelpcenter = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz"; - sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"; - name = "khelpcenter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz"; + sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114"; + name = "khelpcenter-19.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz"; - sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662"; - name = "kidentitymanagement-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz"; + sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a"; + name = "kidentitymanagement-19.04.1.tar.xz"; }; }; kig = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz"; - sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2"; - name = "kig-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz"; + sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79"; + name = "kig-19.04.1.tar.xz"; }; }; kigo = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz"; - sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484"; - name = "kigo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz"; + sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad"; + name = "kigo-19.04.1.tar.xz"; }; }; killbots = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz"; - sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9"; - name = "killbots-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz"; + sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938"; + name = "killbots-19.04.1.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz"; - sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6"; - name = "kimagemapeditor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz"; + sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533"; + name = "kimagemapeditor-19.04.1.tar.xz"; }; }; kimap = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz"; - sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992"; - name = "kimap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz"; + sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f"; + name = "kimap-19.04.1.tar.xz"; }; }; kio-extras = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz"; - sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"; - name = "kio-extras-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz"; + sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd"; + name = "kio-extras-19.04.1.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz"; - sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39"; - name = "kirigami-gallery-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz"; + sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2"; + name = "kirigami-gallery-19.04.1.tar.xz"; }; }; kiriki = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz"; - sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac"; - name = "kiriki-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz"; + sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b"; + name = "kiriki-19.04.1.tar.xz"; }; }; kiten = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz"; - sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf"; - name = "kiten-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz"; + sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4"; + name = "kiten-19.04.1.tar.xz"; }; }; kitinerary = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz"; - sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35"; - name = "kitinerary-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz"; + sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318"; + name = "kitinerary-19.04.1.tar.xz"; }; }; kjumpingcube = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz"; - sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993"; - name = "kjumpingcube-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz"; + sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1"; + name = "kjumpingcube-19.04.1.tar.xz"; }; }; kldap = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz"; - sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e"; - name = "kldap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz"; + sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b"; + name = "kldap-19.04.1.tar.xz"; }; }; kleopatra = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz"; - sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b"; - name = "kleopatra-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz"; + sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67"; + name = "kleopatra-19.04.1.tar.xz"; }; }; klettres = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz"; - sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93"; - name = "klettres-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz"; + sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847"; + name = "klettres-19.04.1.tar.xz"; }; }; klickety = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz"; - sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5"; - name = "klickety-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz"; + sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af"; + name = "klickety-19.04.1.tar.xz"; }; }; klines = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz"; - sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80"; - name = "klines-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz"; + sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962"; + name = "klines-19.04.1.tar.xz"; }; }; kmag = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz"; - sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"; - name = "kmag-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz"; + sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874"; + name = "kmag-19.04.1.tar.xz"; }; }; kmahjongg = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz"; - sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"; - name = "kmahjongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz"; + sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99"; + name = "kmahjongg-19.04.1.tar.xz"; }; }; kmail = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz"; - sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76"; - name = "kmail-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz"; + sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5"; + name = "kmail-19.04.1.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz"; - sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df"; - name = "kmail-account-wizard-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz"; + sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8"; + name = "kmail-account-wizard-19.04.1.tar.xz"; }; }; kmailtransport = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz"; - sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1"; - name = "kmailtransport-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz"; + sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa"; + name = "kmailtransport-19.04.1.tar.xz"; }; }; kmbox = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz"; - sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841"; - name = "kmbox-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz"; + sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0"; + name = "kmbox-19.04.1.tar.xz"; }; }; kmime = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz"; - sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274"; - name = "kmime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz"; + sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775"; + name = "kmime-19.04.1.tar.xz"; }; }; kmines = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz"; - sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"; - name = "kmines-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz"; + sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12"; + name = "kmines-19.04.1.tar.xz"; }; }; kmix = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz"; - sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"; - name = "kmix-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz"; + sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea"; + name = "kmix-19.04.1.tar.xz"; }; }; kmousetool = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz"; - sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8"; - name = "kmousetool-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz"; + sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624"; + name = "kmousetool-19.04.1.tar.xz"; }; }; kmouth = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz"; - sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486"; - name = "kmouth-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz"; + sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068"; + name = "kmouth-19.04.1.tar.xz"; }; }; kmplot = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz"; - sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"; - name = "kmplot-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz"; + sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206"; + name = "kmplot-19.04.1.tar.xz"; }; }; knavalbattle = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz"; - sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3"; - name = "knavalbattle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz"; + sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc"; + name = "knavalbattle-19.04.1.tar.xz"; }; }; knetwalk = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz"; - sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f"; - name = "knetwalk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz"; + sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b"; + name = "knetwalk-19.04.1.tar.xz"; }; }; knights = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz"; - sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990"; - name = "knights-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz"; + sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e"; + name = "knights-19.04.1.tar.xz"; }; }; knotes = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz"; - sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578"; - name = "knotes-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz"; + sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9"; + name = "knotes-19.04.1.tar.xz"; }; }; kolf = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz"; - sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f"; - name = "kolf-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz"; + sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7"; + name = "kolf-19.04.1.tar.xz"; }; }; kollision = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz"; - sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856"; - name = "kollision-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz"; + sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9"; + name = "kollision-19.04.1.tar.xz"; }; }; kolourpaint = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz"; - sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"; - name = "kolourpaint-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz"; + sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46"; + name = "kolourpaint-19.04.1.tar.xz"; }; }; kompare = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz"; - sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285"; - name = "kompare-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz"; + sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261"; + name = "kompare-19.04.1.tar.xz"; }; }; konqueror = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz"; - sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a"; - name = "konqueror-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz"; + sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92"; + name = "konqueror-19.04.1.tar.xz"; }; }; konquest = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz"; - sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172"; - name = "konquest-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz"; + sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab"; + name = "konquest-19.04.1.tar.xz"; }; }; konsole = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz"; - sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"; - name = "konsole-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz"; + sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8"; + name = "konsole-19.04.1.tar.xz"; }; }; kontact = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz"; - sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315"; - name = "kontact-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz"; + sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714"; + name = "kontact-19.04.1.tar.xz"; }; }; kontactinterface = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz"; - sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41"; - name = "kontactinterface-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz"; + sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2"; + name = "kontactinterface-19.04.1.tar.xz"; }; }; kopete = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz"; - sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b"; - name = "kopete-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz"; + sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85"; + name = "kopete-19.04.1.tar.xz"; }; }; korganizer = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz"; - sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c"; - name = "korganizer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz"; + sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67"; + name = "korganizer-19.04.1.tar.xz"; }; }; kpat = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz"; - sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"; - name = "kpat-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz"; + sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896"; + name = "kpat-19.04.1.tar.xz"; }; }; kpimtextedit = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz"; - sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d"; - name = "kpimtextedit-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz"; + sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1"; + name = "kpimtextedit-19.04.1.tar.xz"; }; }; kpkpass = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz"; - sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f"; - name = "kpkpass-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz"; + sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7"; + name = "kpkpass-19.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz"; - sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe"; - name = "kqtquickcharts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz"; + sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72"; + name = "kqtquickcharts-19.04.1.tar.xz"; }; }; krdc = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz"; - sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666"; - name = "krdc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz"; + sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19"; + name = "krdc-19.04.1.tar.xz"; }; }; kreversi = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz"; - sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"; - name = "kreversi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz"; + sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9"; + name = "kreversi-19.04.1.tar.xz"; }; }; krfb = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz"; - sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b"; - name = "krfb-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz"; + sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b"; + name = "krfb-19.04.1.tar.xz"; }; }; kross-interpreters = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz"; - sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c"; - name = "kross-interpreters-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz"; + sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe"; + name = "kross-interpreters-19.04.1.tar.xz"; }; }; kruler = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz"; - sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33"; - name = "kruler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz"; + sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53"; + name = "kruler-19.04.1.tar.xz"; }; }; kshisen = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz"; - sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f"; - name = "kshisen-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz"; + sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6"; + name = "kshisen-19.04.1.tar.xz"; }; }; ksirk = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz"; - sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a"; - name = "ksirk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz"; + sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e"; + name = "ksirk-19.04.1.tar.xz"; }; }; ksmtp = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz"; - sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74"; - name = "ksmtp-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz"; + sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb"; + name = "ksmtp-19.04.1.tar.xz"; }; }; ksnakeduel = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz"; - sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36"; - name = "ksnakeduel-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz"; + sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046"; + name = "ksnakeduel-19.04.1.tar.xz"; }; }; kspaceduel = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz"; - sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11"; - name = "kspaceduel-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz"; + sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7"; + name = "kspaceduel-19.04.1.tar.xz"; }; }; ksquares = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz"; - sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d"; - name = "ksquares-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz"; + sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773"; + name = "ksquares-19.04.1.tar.xz"; }; }; ksudoku = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz"; - sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"; - name = "ksudoku-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz"; + sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b"; + name = "ksudoku-19.04.1.tar.xz"; }; }; ksystemlog = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz"; - sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"; - name = "ksystemlog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz"; + sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4"; + name = "ksystemlog-19.04.1.tar.xz"; }; }; kteatime = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz"; - sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d"; - name = "kteatime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz"; + sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0"; + name = "kteatime-19.04.1.tar.xz"; }; }; ktimer = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz"; - sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e"; - name = "ktimer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz"; + sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809"; + name = "ktimer-19.04.1.tar.xz"; }; }; ktnef = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz"; - sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec"; - name = "ktnef-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz"; + sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93"; + name = "ktnef-19.04.1.tar.xz"; }; }; ktouch = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz"; - sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6"; - name = "ktouch-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz"; + sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2"; + name = "ktouch-19.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz"; - sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb"; - name = "ktp-accounts-kcm-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz"; + sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045"; + name = "ktp-accounts-kcm-19.04.1.tar.xz"; }; }; ktp-approver = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz"; - sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6"; - name = "ktp-approver-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz"; + sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd"; + name = "ktp-approver-19.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz"; - sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be"; - name = "ktp-auth-handler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz"; + sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65"; + name = "ktp-auth-handler-19.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz"; - sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571"; - name = "ktp-call-ui-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz"; + sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f"; + name = "ktp-call-ui-19.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz"; - sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740"; - name = "ktp-common-internals-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz"; + sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1"; + name = "ktp-common-internals-19.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz"; - sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1"; - name = "ktp-contact-list-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz"; + sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9"; + name = "ktp-contact-list-19.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz"; - sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9"; - name = "ktp-contact-runner-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz"; + sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f"; + name = "ktp-contact-runner-19.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz"; - sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4"; - name = "ktp-desktop-applets-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz"; + sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75"; + name = "ktp-desktop-applets-19.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz"; - sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231"; - name = "ktp-filetransfer-handler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz"; + sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189"; + name = "ktp-filetransfer-handler-19.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz"; - sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854"; - name = "ktp-kded-module-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz"; + sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66"; + name = "ktp-kded-module-19.04.1.tar.xz"; }; }; ktp-send-file = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz"; - sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2"; - name = "ktp-send-file-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz"; + sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a"; + name = "ktp-send-file-19.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz"; - sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e"; - name = "ktp-text-ui-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz"; + sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5"; + name = "ktp-text-ui-19.04.1.tar.xz"; }; }; ktuberling = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz"; - sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04"; - name = "ktuberling-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz"; + sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb"; + name = "ktuberling-19.04.1.tar.xz"; }; }; kturtle = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz"; - sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253"; - name = "kturtle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz"; + sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d"; + name = "kturtle-19.04.1.tar.xz"; }; }; kubrick = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz"; - sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3"; - name = "kubrick-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz"; + sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7"; + name = "kubrick-19.04.1.tar.xz"; }; }; kwalletmanager = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz"; - sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"; - name = "kwalletmanager-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz"; + sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d"; + name = "kwalletmanager-19.04.1.tar.xz"; }; }; kwave = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz"; - sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"; - name = "kwave-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz"; + sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6"; + name = "kwave-19.04.1.tar.xz"; }; }; kwordquiz = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz"; - sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc"; - name = "kwordquiz-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz"; + sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158"; + name = "kwordquiz-19.04.1.tar.xz"; }; }; libgravatar = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz"; - sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee"; - name = "libgravatar-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz"; + sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522"; + name = "libgravatar-19.04.1.tar.xz"; }; }; libkcddb = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz"; - sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29"; - name = "libkcddb-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz"; + sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51"; + name = "libkcddb-19.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz"; - sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926"; - name = "libkcompactdisc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz"; + sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee"; + name = "libkcompactdisc-19.04.1.tar.xz"; }; }; libkdcraw = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz"; - sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"; - name = "libkdcraw-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz"; + sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c"; + name = "libkdcraw-19.04.1.tar.xz"; }; }; libkdegames = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz"; - sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"; - name = "libkdegames-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz"; + sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c"; + name = "libkdegames-19.04.1.tar.xz"; }; }; libkdepim = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz"; - sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640"; - name = "libkdepim-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz"; + sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45"; + name = "libkdepim-19.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz"; - sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4"; - name = "libkeduvocdocument-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz"; + sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59"; + name = "libkeduvocdocument-19.04.1.tar.xz"; }; }; libkexiv2 = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz"; - sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"; - name = "libkexiv2-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz"; + sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae"; + name = "libkexiv2-19.04.1.tar.xz"; }; }; libkgapi = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz"; - sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924"; - name = "libkgapi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz"; + sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e"; + name = "libkgapi-19.04.1.tar.xz"; }; }; libkgeomap = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz"; - sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b"; - name = "libkgeomap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz"; + sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a"; + name = "libkgeomap-19.04.1.tar.xz"; }; }; libkipi = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz"; - sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31"; - name = "libkipi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz"; + sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020"; + name = "libkipi-19.04.1.tar.xz"; }; }; libkleo = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz"; - sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69"; - name = "libkleo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz"; + sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529"; + name = "libkleo-19.04.1.tar.xz"; }; }; libkmahjongg = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz"; - sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"; - name = "libkmahjongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz"; + sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb"; + name = "libkmahjongg-19.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz"; - sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c"; - name = "libkomparediff2-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz"; + sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3"; + name = "libkomparediff2-19.04.1.tar.xz"; }; }; libksane = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz"; - sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034"; - name = "libksane-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz"; + sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417"; + name = "libksane-19.04.1.tar.xz"; }; }; libksieve = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz"; - sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754"; - name = "libksieve-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz"; + sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff"; + name = "libksieve-19.04.1.tar.xz"; }; }; lokalize = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz"; - sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"; - name = "lokalize-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz"; + sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1"; + name = "lokalize-19.04.1.tar.xz"; }; }; lskat = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz"; - sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2"; - name = "lskat-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz"; + sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf"; + name = "lskat-19.04.1.tar.xz"; }; }; mailcommon = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz"; - sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1"; - name = "mailcommon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz"; + sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f"; + name = "mailcommon-19.04.1.tar.xz"; }; }; mailimporter = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz"; - sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3"; - name = "mailimporter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz"; + sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696"; + name = "mailimporter-19.04.1.tar.xz"; }; }; marble = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz"; - sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"; - name = "marble-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz"; + sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61"; + name = "marble-19.04.1.tar.xz"; }; }; mbox-importer = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz"; - sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201"; - name = "mbox-importer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz"; + sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a"; + name = "mbox-importer-19.04.1.tar.xz"; }; }; messagelib = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz"; - sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8"; - name = "messagelib-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz"; + sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad"; + name = "messagelib-19.04.1.tar.xz"; }; }; minuet = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz"; - sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"; - name = "minuet-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz"; + sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0"; + name = "minuet-19.04.1.tar.xz"; }; }; okular = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz"; - sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"; - name = "okular-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz"; + sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e"; + name = "okular-19.04.1.tar.xz"; }; }; palapeli = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz"; - sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593"; - name = "palapeli-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz"; + sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b"; + name = "palapeli-19.04.1.tar.xz"; }; }; parley = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz"; - sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75"; - name = "parley-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz"; + sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f"; + name = "parley-19.04.1.tar.xz"; }; }; picmi = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz"; - sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49"; - name = "picmi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz"; + sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c"; + name = "picmi-19.04.1.tar.xz"; }; }; pimcommon = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz"; - sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e"; - name = "pimcommon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz"; + sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72"; + name = "pimcommon-19.04.1.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz"; - sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941"; - name = "pim-data-exporter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz"; + sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd"; + name = "pim-data-exporter-19.04.1.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz"; - sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5"; - name = "pim-sieve-editor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz"; + sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10"; + name = "pim-sieve-editor-19.04.1.tar.xz"; }; }; poxml = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz"; - sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7"; - name = "poxml-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz"; + sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9"; + name = "poxml-19.04.1.tar.xz"; }; }; print-manager = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz"; - sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d"; - name = "print-manager-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz"; + sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa"; + name = "print-manager-19.04.1.tar.xz"; }; }; rocs = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz"; - sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11"; - name = "rocs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz"; + sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61"; + name = "rocs-19.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz"; - sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f"; - name = "signon-kwallet-extension-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz"; + sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38"; + name = "signon-kwallet-extension-19.04.1.tar.xz"; }; }; spectacle = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz"; - sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"; - name = "spectacle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz"; + sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c"; + name = "spectacle-19.04.1.tar.xz"; }; }; step = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz"; - sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755"; - name = "step-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz"; + sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05"; + name = "step-19.04.1.tar.xz"; }; }; svgpart = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz"; - sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef"; - name = "svgpart-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz"; + sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624"; + name = "svgpart-19.04.1.tar.xz"; }; }; sweeper = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz"; - sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0"; - name = "sweeper-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz"; + sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637"; + name = "sweeper-19.04.1.tar.xz"; }; }; umbrello = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz"; - sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"; - name = "umbrello-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz"; + sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2"; + name = "umbrello-19.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.3"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz"; - sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12"; - name = "zeroconf-ioslave-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz"; + sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87"; + name = "zeroconf-ioslave-19.04.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ed5bf6a85c5ef..dfd1ddf8503f3 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -119,6 +119,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 353cf620ee741..5445c7efb59be 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages -, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd +, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; + nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost cmake ffmpeg gettext glew ilmbase + [ boost ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc @@ -80,6 +81,15 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages} ''; + # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be + # found. See the explanation in libglvnd. + postFixup = optionalString cudaSupport '' + for program in $out/bin/blender $out/bin/.blender-wrapped; do + isELF "$program" || continue + addOpenGLRunpath "$program" + done + ''; + meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; homepage = https://www.blender.org; diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index e1fcbbfe13c20..b973c73c0dd85 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,31 +1,29 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "cointop-unstable-${version}"; - version = "2018-05-03"; - rev = "08acd96082682347d458cd4f861e2debd3255745"; +buildGoModule rec { + pname = "cointop"; + version = "1.2.0"; - goPackagePath = "github.com/miguelmota/cointop"; - - src = fetchgit { - inherit rev; - url = "https://github.com/miguelmota/cointop"; - sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi"; + src = fetchFromGitHub { + owner = "miguelmota"; + repo = pname; + rev = version; + sha256 = "1vhsbk55rrsmnh9b3cxjiv1pzdiip54cyj31j4aj33vlr4hkampn"; }; - goDeps = ./deps.nix; + modSha256 = "0vvypp97b3bjwxb96hajpjzr52sb5lc4r3zdkrdgg3vjwwacjwsn"; - meta = { + meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; longDescription = '' - cointop is a fast and lightweight interactive terminal based UI application - for tracking and monitoring cryptocurrency coin stats in real-time. + cointop is a fast and lightweight interactive terminal based UI + application for tracking and monitoring cryptocurrency coin stats in + real-time. - The interface is inspired by htop and shortcut keys are inspired by vim. + The interface is inspired by htop and shortcut keys are inspired by vim. ''; - homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.unix; # cannot test others - maintainers = [ ]; - license = stdenv.lib.licenses.asl20; + homepage = "https://cointop.sh"; + maintainers = [ maintainers.marsam ]; + license = licenses.asl20; }; } diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix deleted file mode 100644 index 3ba1d12a8048b..0000000000000 --- a/pkgs/applications/misc/cointop/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ -] diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0d7f460fb0626..37352915cb847 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales -, gtk3, keybinder3, libnotify, libutempter, vte }: +, gtk3, keybinder3, libnotify, libutempter, vte, libwnck3 }: let - version = "3.5.0"; + version = "3.6.3"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "0fz0gciw5fpxrp6yyji27l7q8c0r9ljsq6vw584mr70bcl1gzjqx"; + sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; }; # Strict deps breaks guake @@ -23,7 +23,7 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; - propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 libwnck3 ]; LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix new file mode 100644 index 0000000000000..7207dea9d522e --- /dev/null +++ b/pkgs/applications/misc/lifelines/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lifelines"; + version = "unstable-2019-05-07"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "43f29285ed46fba322b6a14322771626e6b02c59"; + sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y"; + }; + + buildInputs = [ + gettext + libiconv + ncurses + perl + ]; + nativeBuildInputs = [ autoreconfHook bison ]; + + meta = with stdenv.lib; { + description = "Genealogy tool with ncurses interface"; + homepage = "https://lifelines.github.io/lifelines/"; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 6c23d160f47c1..b44169adea8dd 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plasma-applet-volumewin7mixer-${version}"; - version = "23"; + version = "24"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc"; + sha256 = "1pms71229y7fv3zs38a0l9mdcg5qkcdv9yrcvdm6xqpdyk21jbz2"; }; patches = [ ./cmake.patch ]; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix new file mode 100644 index 0000000000000..7aaa8a8c38d20 --- /dev/null +++ b/pkgs/applications/misc/pstree/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "pstree"; + version = "2.39"; + + src = fetchurl { + urls = [ + "https://distfiles.macports.org/${pname}/${pname}-${version}.tar.gz" + "https://fossies.org/linux/misc/${pname}-${version}.tar.gz" + "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz" + ]; + sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; + }; + + sourceRoot = "."; + buildPhase = '' + runHook preBuild + $CC $NIX_CFLAGS -o pstree pstree.c + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm0555 ${pname} -t $out/bin + install -Dm0444 ${pname}.1 -t $out/share/man/man1 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Show the set of running processes as a tree"; + homepage = "http://www.thp.uni-duisburg.de/pstree/"; + license = licenses.gpl2; + maintainers = [ maintainers.c0bw3b ]; + platforms = platforms.unix; + priority = 5; # Lower than psmisc also providing pstree on Linux platforms + }; +} diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 82b8f2cf84718..1ed54b05ec8c0 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.07"; + version = "1.08.1"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; + owner = pname; + repo = pname; rev = "${version}BETA"; - sha256 = "0syxmliybgvm9j6d426l7j12ryrl42azy80m66jc56fv9nkqwaya"; + sha256 = "0x89pn056h8b4yvxbd6l3qwrghslxc7vlxnblmcmsx7xx4i041ng"; }; nativeBuildInputs = [ - cmake gettext perl pkgconfig zip + cmake gettext perl pkgconfig zip ]; buildInputs = [ libXext libXi libXt libXtst wxGTK31 @@ -49,11 +49,10 @@ stdenv.mkDerivation rec { done ''; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A password database utility"; - longDescription = '' Password Safe is a password database utility. Like many other such products, commercial and otherwise, it stores your @@ -61,8 +60,7 @@ stdenv.mkDerivation rec { one password (the "safe combination"), instead of all the username/password combinations that you use. ''; - - homepage = https://pwsafe.org/; + homepage = "https://pwsafe.org/"; maintainers = with maintainers; [ c0bw3b pjones ]; platforms = platforms.linux; license = licenses.artistic2; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 776ba8f081e3c..cdd78866cdcb1 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1hzwqg22sjiirx6743512271p3jlakrw0155av1phrv5b7p3ws8a"; + sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index a12f3dc304ba4..fc5abf1098947 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -1,20 +1,23 @@ -{ stdenv, lib, dpkg, fetchurl, gtk2, jre, libXtst, makeWrapper }: +{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: stdenv.mkDerivation rec { name = "xmind-${version}"; - version = "7.5-update1"; + version = "8-update8"; - src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_i386.deb"; - sha256 = "04kr6pw0kwy715bp9wcnqnw1k5wl65xa87lhljrskm291p402jy1"; - } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_amd64.deb"; - sha256 = "1j2ynhk7p3m3vd6c4mjwpnlzqgfj5c4q3zydab3nfwncwx6gaqj9"; - } else throw "platform ${stdenv.hostPlatform.system} not supported!"; + src = fetchzip { + url = "https://xmind.net/xmind/downloads/${name}-linux.zip"; + stripRoot = false; + sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn"; + }; + + srcIcon = fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind"; + sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; + }; - nativeBuildInputs = [ dpkg makeWrapper ]; + patches = [ ./java-env-config-fixes.patch ]; - unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; dontPatchELF = true; @@ -22,12 +25,27 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ gtk2 libXtst ]; - installPhase = '' - mkdir -p $out - cp -r usr/lib/xmind $out/libexec - cp -r usr/bin usr/share $out - rm $out/libexec/XMind.ini - mv etc/XMind.ini $out/libexec + desktopItem = makeDesktopItem { + name = "XMind"; + exec = "XMind"; + icon = "xmind"; + desktopName = "XMind"; + comment = meta.description; + categories = "Office;"; + mimeType = "application/xmind;xscheme-handler/xmind"; + }; + + installPhase = let + targetDir = if stdenv.hostPlatform.system == "i686-linux" + then "XMind_i386" + else "XMind_amd64"; + in '' + mkdir -p $out/{bin,libexec/configuration/,share/{applications/,fonts/,icons/hicolor/scalable/apps/}} + cp -r ${targetDir}/{configuration,p2,XMind{,.ini}} $out/libexec + cp -r {plugins,features} $out/libexec/ + cp -r fonts $out/share/fonts/ + cp "${desktopItem}/share/applications/XMind.desktop" $out/share/applications/XMind.desktop + cp ${srcIcon} $out/share/icons/hicolor/scalable/apps/xmind.png patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ $out/libexec/XMind @@ -35,8 +53,17 @@ stdenv.mkDerivation rec { wrapProgram $out/libexec/XMind \ --prefix LD_LIBRARY_PATH : "${libPath}" - substituteInPlace "$out/bin/XMind" \ - --replace '/usr/lib/xmind' "$out/libexec" + # Inspired by https://aur.archlinux.org/cgit/aur.git/tree/?h=xmind + cat >$out/bin/XMind <<EOF + #! ${runtimeShell} + if [ ! -d "\$HOME/.xmind" ]; then + mkdir -p "\$HOME/.xmind/configuration-cathy/" + cp -r $out/libexec/configuration/ \$HOME/.xmind/configuration-cathy/ + fi + + exec "$out/libexec/XMind" "$@" + EOF + chmod +x $out/bin/XMind ln -s ${jre} $out/libexec/jre ''; @@ -55,9 +82,9 @@ stdenv.mkDerivation rec { GTD. Meanwhile, XMind can read FreeMind and MindManager files, and save to Evernote. ''; - homepage = http://www.xmind.net/; + homepage = https://www.xmind.net/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus ma27 ]; }; } diff --git a/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/pkgs/applications/misc/xmind/java-env-config-fixes.patch new file mode 100644 index 0000000000000..f359a9c2ba468 --- /dev/null +++ b/pkgs/applications/misc/xmind/java-env-config-fixes.patch @@ -0,0 +1,40 @@ +diff --git a/XMind_amd64/XMind.ini b/XMind_amd64/XMind.ini +index bdd8a37..5f35daf 100644 +--- a/XMind_amd64/XMind.ini ++++ b/XMind_amd64/XMind.ini +@@ -1,11 +1,11 @@ + -configuration +-./configuration ++@user.home/.xmind/configuration-cathy_linux_64 + -data +-../workspace ++@user.home/.xmind/workspace-cathy + -startup +-../plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar ++plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar + --launcher.library +-../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444 ++plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444 + --launcher.defaultAction + openFile + --launcher.GTK_version +diff --git a/XMind_i386/XMind.ini b/XMind_i386/XMind.ini +index 4ed3225..1d74258 100644 +--- a/XMind_i386/XMind.ini ++++ b/XMind_i386/XMind.ini +@@ -1,11 +1,11 @@ + -configuration +-./configuration ++@user.home/.xmind/configuration-cathy_linux_64 + -data +-../workspace ++@user.home/.xmind/workspace-cathy + -startup +-../plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar ++plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar + --launcher.library +-../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444 ++plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444 + --launcher.defaultAction + openFile + --launcher.GTK_version diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index c306e8e6d92b3..f91989e22a9b4 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-344"; + name = "xterm-345"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; + sha256 = "0dfmy9vgpmxi8rsnv2lb2lmq5ny26f0pjhcj348l0d3rs61afjb6"; }; buildInputs = diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix new file mode 100644 index 0000000000000..36f6279c20924 --- /dev/null +++ b/pkgs/applications/networking/Sylk/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: + +let + pname = "Sylk"; + version = "2.1.0"; +in + +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; + sha256 = "1ifi8qr6f84dcssxhv5ar1s48nsqxiv2j1blc82248hmq5is24mf"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Sylk WebRTC client"; + homepage = "http://sylkserver.com/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zimbatm ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix new file mode 100644 index 0000000000000..26b3c3ace8bf4 --- /dev/null +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, desktop-file-utils +, gettext +, glib +, gtk3 +, hicolor-icon-theme +, libgee +, libdazzle +, meson +, ninja +, pantheon +, pkgconfig +, python3 +, webkitgtk +, wrapGAppsHook +, glib-networking +}: + +stdenv.mkDerivation rec { + pname = "ephemeral"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = "ephemeral"; + rev = version; + sha256 = "1wfrbbdw429q2mkycn87fhci0jidcsflk5f2lbzfzccbcs8msffz"; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gtk3 + hicolor-icon-theme + libdazzle + libgee + pantheon.granite + webkitgtk + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "The always-incognito web browser"; + homepage = https://github.com/cassidyjames/ephemeral; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3f0a39a2b4453..3f5d08e22880c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0.5"; + version = "67.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ach/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ach/firefox-67.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "81dd4f3df0953e6234484bf0f55973123336e374ee38e0ca7c1aae3dc12e66aefb18c985be7e98578c857c6d2cd86d5319ac9aa2170b4df7eb47fe8fc7373b08"; + sha512 = "bd13f2eaa912fc16087c6faedcf8aed20ca1bee842eab9c88b2787d92b8f639c6420a99c7192d5fa9d9b4f5d52f83e2005f115f990e503b9e24af407bd31733f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/af/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/af/firefox-67.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "87cc2d6c5aa0c5a8eeb910af6780144111f81fcfbdf4aecffcc046b5317669d29329347920117256f2442e8b08b11fb9886c7f9558647db9847637b07aac272f"; + sha512 = "883552af262b8caddf0406d544acad5a6379ac685842ea2f637b489998993a3b717cf9ed4aeea79f5fbeb66f980222a702fd4e4dd8153259be5ff15422193db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/an/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/an/firefox-67.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b15896cb8c138b444b779362a38bac2defaf012818696d303025dc1e1dda7efd57032ebab254d393d8fef31356a525dff87aa65d60dd65198cd0e47bd87c27f2"; + sha512 = "997eae193da0d2b025b687db2df0ea8a773a96399c75b9efbdd82affc6fb4150761d70ac5b934f217177b54fc5abbcc0a8f2375e90a021bca7b168c485721af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ar/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ar/firefox-67.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d7f6e90064ce4fe123922f786c9395706c12ef1093b34ce60564255325fa14da9c46c24344a45f27a2e6e1b606f1e8bf6c5891c278763e3f4f70566c3b128970"; + sha512 = "de3d693d2f3fd5de93c6e732b5780e1ebb775ed0cc818af75f22ac7c505c9a6852872ac59db3cf3844e26a3ac3643c9facb3a4afeb0050ba485a5577e7ec6649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/as/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/as/firefox-67.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "ef2eb62a16e865a6f0ec796dc17a91da99b5643326a102019a55d3c477d68b62a566d0c73feb5aa1c23347bc7f358e1b6d116608945e03e4136baa6ade97d763"; + sha512 = "681c02e6b1a4f26937751f01d3b272cc242afa7be5f5bde45b8bc90e8c4ac7856331cce86b850d33a5440f8f0c4b08a6c54875bcad463e83c686c093068a1100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ast/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ast/firefox-67.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fd5a01a343911f5d0cf4afafb0994cd236ce5f477a020272e56222eb216efb27b610a6aea26273c76b3947f62538d613d4af0a0d5ee16f6c985aa7b637dc4832"; + sha512 = "b60e5ac3ab934bbe43aa361132624621e963e4f272fb4e43c091259644e2104591e82a51a7b3abe99a3e79b31d2de37ce0b405fd66700333e292948a36691bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/az/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/az/firefox-67.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2674b4404da94eceb54bb91208d622adbd0c433691e6bf09b93b784c112f77c5b6a7f655000a8a1ae6b2957c96637ba2b61fcb18d4a028a70c8ea6b4c82f7c72"; + sha512 = "728ab5cb663166f91d0320caba207aaa9cfec9974ee605f4d0aa977af9392aea632d5b494906f3db8848cff8bcafb9e44247b7afb56316344df7ed9de709311e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/be/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/be/firefox-67.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b79bdfc175ac65bbf13a50eccbcd47587d05e1a7e937eaa91598f546c2ef33b99c5b9b5ff14cb155add7602132dce98ee298764c40c27e72c221f3d64a3ed7d7"; + sha512 = "0d8a8fd5efa732a5ce128203354eaffaf36915ececdedb6246c50fd98a0200ba79b99f1e9ef4b8586f4a6672206e3da5f509dc27bf473aabb455ebd9c05631c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bg/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bg/firefox-67.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "206aa03f0299af698149d93eba7b232835d5471e60ccc6bbedfc1566e0375a88e8bcd8da882f80b500fad9e850c1ff6657eddce499abf6ac976b1fb0eed77e4d"; + sha512 = "d7ed4da9b362082ba6cd26121993f762b32de8ac0a9c509e2124305850522224a94c06150a06ae2d776d05824555c1c7ce2c6b0dea384fe310ee3afd63791a7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-BD/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-BD/firefox-67.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "54f8f199008519e57d474f49ad8b28163fea3ea158a94fec2c437ce81336059ba8fdc70cc080c79667dd8172aa89152e0bea08a67a2f140628682d66c0da07c7"; + sha512 = "f72228b5db342270b00c994657649c1c907eccff938fb0104d33b73b91883a2a8214310442d0e7757c48c317c973a5c2f010630e93c036a8b2918158d6453541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-IN/firefox-67.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "e78887887b3793bcc659f9dff24661aa5175f4c614797c47fd7063e36b668c865cc61e65ad0b040cccd499ae99d41aae215c86f43f837149fc612ce7c02ea908"; + sha512 = "994f69057e6b01f357fe550ff096d8e261a7a51522bf8f882457d64dd65baa0320af212427949f2d4eaa115506e0f935217d6fcd0f903600b329fd4993fe9e6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/br/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/br/firefox-67.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "da4e0af68be8aa38db212beb0a6d9f4de14571fa32ddd28d47a439626111ac0fedcfc7976250e03a40aff626522840731a1febc3718fba5cde08f02cbc045e1b"; + sha512 = "d525a701c3a69d9bcfd405f19fbf4a5bea08af25c8aa4c42561d7133c8b40102a172c7cb2b7bee6e8ed084795c05623a174b2b9c5fbae3017678d983029d469f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bs/firefox-67.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "68d1a09118c0a81dca3edcd3eb0e36384fcb370c708956c84681b6f41a084256df2c463a8539fde497a34015cdb4523c340bd34080e433b7eb71e66db35c89ac"; + sha512 = "f63abc3c422462442e8f6d1a07fe17e70c1f48bf569587baafa25ea7f401eb459f9c2de42577eb6ad5f42184bc82514e0b55da7338970d7b1ad0665cb4f07637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ca/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ca/firefox-67.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f76264197f35bb8feba8905600fd4cffa9561e17bfcc811a880a81c25a9a9c12bed29db9e4c53c99ddcc8796f45fb83003301df2cafac93eda582ca6ad92334f"; + sha512 = "af74fca15fc8e7977ad820e68bb0745a1a640b9206203eb6d7891fd2b861387d859bc19fe520b830b41ce54695447b1904951c663d5e39b89a90672a4fe4d537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cak/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cak/firefox-67.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "779e3e776877aa1116bfb9c21276f6e1b2b9813c854b38894a2c4beec39a52d15ba3ace536a58011216defb729c4a26a6d80becbae967b0ddd2126d9ef8056a7"; + sha512 = "e0e03b594ef9c1bdd481c37a184d46d74b17ed7f0ef9efb7e2f22a94a05dad66516986e6b907825b1793e9bc2c4154e06430199f3d636660071f010d5b0f99b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cs/firefox-67.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bf4d60effd3628602be7ebae080bc429e6d0795ab2c4bc4e703e0a1d92b1cd4885dd3af10f22e939dbfd8d83cb1b79c90cad424fd2bafa976f9bb9dc3ec78c94"; + sha512 = "372487ef14fbc6300f8a349ecadde66eb4ce76aa43efd7aeda76b0387d86c7ce48e14e8db96a6939ce1919869852f59de307e74bb181cde71748bc0a3af5ffa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cy/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cy/firefox-67.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f485f1e307db31a6382542a2ed4c103483342bee05790661db1f12d11585d029793096f6e0d881388f317d54878ba10dd7f6703b488e80417d1af4b3f83771a5"; + sha512 = "38274afab73b5feac2f91a20ec8308ed195ffcd5eb700a038ce0c3cc969f926290b0ae4439d29161d206a4e19f6fbae89cd61954afd1b72efb3cc87e5887ad0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/da/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/da/firefox-67.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6870622105879e703072153b0fd8b5e00b1e5621270fa187d0795675e69e39943e3232404d8702defe6844f75335292615d7c5f128fb3881eb027a90d3fb9710"; + sha512 = "694113fa37c868a14fedfe6b5b13ef12310cef49cadb363632864a1bb94128752dde20f3fc6afe8b1bafd16ad7b077a9ad6c71109b82e2b805d2d08be28e8cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/de/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/de/firefox-67.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "58a9ca0b2faa54193854f5467d9efd989be71560afcd32f013bcfdc01a8f51a24d54850bb02527c58a1c39f698b66144af899f6820ad867edc725a7c0399442f"; + sha512 = "205cc9c7cbd9178c43b797d427c6d8b0ba1cf4402bdf8b2b2a8d08baaf1bb60bb1b3ed406fb3d3983b64c0b353e54230d992288d4ff09e44aeb708dbb88cbf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/dsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/dsb/firefox-67.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8ebe982a0f7d0520654093af62ba62e2d9415ea1bc3ea1f12f14d64c15d4db70f64abee3ea9141a875cf487f72287fffaa2085e66b610a01bc40b0ad2c944efb"; + sha512 = "9afed55b0ea1849b9939f6f6620a5e5b9d312b453f0dec7091fb8223e5a02cd56c7e7c010f274a30e97668b7f029643487bdc2d5266e87e0ace2f87013bb6e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/el/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/el/firefox-67.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cafe8a9933947fbd7acea7234ced4ff7061a3e2136e5fa5789fea64aba96b1731e3a1e7120f4dec1dd0353763435089354998e2d151b1a884ef927a799edd1d4"; + sha512 = "9252dae6819ffc391c597d28fa7cac4dbe30658fbe88c06075cf5cde78130dda3d42222147a98ebe12e55db2dce4a629b4825d64b4fb8c829f8919c7daec9e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-CA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-CA/firefox-67.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ffdda6e16d9b43c23aebd5e876296f9dcfdf3cfc54577e4031ca25d004aad53ba63057e2875840fb054f8fe080532361c1fc613382ca23a521aeb844e1626dbb"; + sha512 = "118036bec1ec81a1353d5e43fcba49cab5f759f01c05cee3757346e7368e190eaca08e4b5a50922d0a7b2fc8667467e2f62114c60d3a03dc866d4a19fb6f0938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-GB/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-GB/firefox-67.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "69351e93fffcf3279abc7b23a81c262b1e804cbec7da3b55b3a62a3062a59dfc6894fe41975bb9f70bba01364f0d5bd86f0659b82f9bd9b9ce8a14b66cb24506"; + sha512 = "3d2e2f8e9de36281b5679201bd632d546269fd05bbb802a45484d0e5c75678b2aa1560afe8e711878eb36f6d1b1e10e784e7fc9ba600ca8407bcf6cb2c2bfed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-US/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-US/firefox-67.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbb43a8c1ffe1884c551421bc32f8e48239200af62800e8ff5b18d461b1ddd7b5d0c9afe0e262f98112bbde2949fedc740209e957bcee0b2c30a19e17bd5428"; + sha512 = "fa6572a1dddc8b0563250e0ceffe4df3394aafe2995a82b9055900695c28c3069bd9afd8e55fa710f7f8f046524c0fa92cbc61478154cffc6e23aae8b3ee4e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-ZA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-ZA/firefox-67.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8bf0583385c31dc6cf3d4df7790d06790a9387f59c54f18f30d3df05cc110bda2fefa6764d732c90e7f6eab4e42e594230da966acf1ebae078710f99793919d2"; + sha512 = "d843df8bb67d13f402c134a341db1ebaf1f6c989a797d50de2232ba7082823cad40d04ca818c00db9e24919df02eef5c240a3575a78285333a2ac2c56a0d53f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eo/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eo/firefox-67.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2a72aed4c755f463dcb97549d7f9fd644ce1bc0e259eff7bfe5b43148a5cca32315779121fc1d02c189961d7aa6953d62bd7f56c6925a321d1081765f11b2b11"; + sha512 = "00de95ec91364c1a45dafa5f2a90c7e27fba1689510d4c390822b15c23dccf7921d312533079e4c3f9748377141801d762004f2e72adc79c6b3dd56eea220aca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-AR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-AR/firefox-67.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f5b297e47bc51811e2096f9cf60686b0732a6f7eabde581ecc585b192341724e5656d251b7da545d99dce840b2aca2692c5e6b4eef4796b58e791dd59709c12b"; + sha512 = "7aac4213376dc8e797ebf2ea9301377fb1a9503dc2b43d9fe8092186c871234b1b628a9d0cba5dc8b331205b91ae96a49629a195ec9ebca68507c01fbe6ef220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-CL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-CL/firefox-67.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "94ba91ab326ccd20ac60da18429e9a787de3e97057eabc24ef38e6ba44066108eb18e8d58f2148a8b7a28b47aee65b12673b51b1a3eb8f733af199ef0b865c4d"; + sha512 = "5a9ef07bb61870a4460fa7279f1cfca3d48c71fc8cd7b708cc717e1f310d5b70196219ab855d6d272c9ed30f8a65aff9d56d15d160da45cd95ef2b45d9326c3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-ES/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-ES/firefox-67.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f40a14cc05855ca16efeed2c78a4342c1f6439f6f380e42ceb47433e1cc9088e17a91b656ce098d02d6b92b927bf33c0288f2bf2941d99e10b9e536ee71108aa"; + sha512 = "03649671ae73569c3378b12f9de04bea366670c6005f73fbf247d8fceebde4572b3f408905515bacc721672de720f051cbb997ca8f1627fbc6e245014b262f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-MX/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-MX/firefox-67.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dd3ca519b32a1951844a0bc54690be59a9843000873091a830df54fb8cc92b866fe448a5216d253a3118d533baac672e3c56464cceb5d3b920b5b6c51a3b5163"; + sha512 = "03e04d2e636806f10dce66afe2602bb93ad5ef911189f272eaa1414d07287f5ab83e4fc95c65fef5c5cc9e050b384a3fe83bf8a1a1f3027a8d0d9171ba747759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/et/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/et/firefox-67.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5dffa53a49117d2f0c6442ce343c08c5f5764535273ab85f7e603736fac25795fa672113384de47b649d7214c84af3d249ef1e9ffb43db7d81e51e59184f8322"; + sha512 = "b7a5b1ac669615f9d54c8f05693a529286b0028d64a20d490d89192894397f204beb7dfa36015715c493012c5d98985507e40ffda8a512229524f6fb51d73fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eu/firefox-67.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f401b7084044c346343c52dee074ecc3478dde92cf9ee9f624749e88ab2ae5c9f70b7a979129e84172d785a81228edddb9023351b61d6c74c2ab1137843f67f1"; + sha512 = "e29bf62382356861e5f27193af8888041791a18e3400bd3f363335b6d7feacad170c324da04d6a719de45e146e6d0bfae8b8510e9bc5bc1bf337b3fcf3594980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fa/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fa/firefox-67.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "af65c1415f5fd26cf0b14dce1855266a2e295817405abac6402f20f7a409466e7d7dc06a9233b5cb9064f9ba5e954246db20ceea0f0bbed4d42e93cda77e22a4"; + sha512 = "715c176902bc4554ca01381aec9286c8ab22955e7397cd0fb85b3600c059dcf1da33999c13103344231b6740574c0c96405f452d642762ba0f10924d9bfeb1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ff/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ff/firefox-67.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "6440b9db16a365f44064da652ea4b36b9976794896e062d627e200d6781d35fbbc98ac6d148c45de38788b204005ecdb0857fe2e02cb7240536c00e5ca3fd8a2"; + sha512 = "551abf97052c1fbe079454b6a30c5f920e7a3f7e733b14949bbdd19ef9b025037fb0a0cdb9571186e451e4f46d2a5f56ab54dc101805c1717995c3d0ae1cc470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fi/firefox-67.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "756a89e20d96e548b27570a907595b9aac701df8ad9262f5c82ddbd25d508e07b603f8d24769d756e83e6e4e9076144bdf39f66ba4f1983dc447646d0eb88b9b"; + sha512 = "571a54c29163b9cfa7cdebbc4f54a7f4e8d00db350a78ba091c2b1b8dd497f17ecd06224d70bbc5a000389946b98415b6364f1025b012f098890a6357f36585b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fr/firefox-67.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2c26924902510167d88e660fb5236e6738defa5cf5600daf1cf9267e7ea05541109d5e736b7f78e311b2e31e53216ac22d9236f91a51498c40e376fa1a4d9387"; + sha512 = "c6eca020c0bc956b3091a32d1fffc8525a17d37aca125b6cc52e8c5bbc0a1732f2b39d2c9d40ad9f8da39d27f92349052c8b11d70eed14ee077ef2d85411c44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fy-NL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fy-NL/firefox-67.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e45b45c0b84504c978906dab3057c9213301767efc4e63c760ebd4d8b44b59ad72fe486877216f6062a592ca173a13fa5341ffaa1106763a43c215201b390079"; + sha512 = "5290df5a5744e5923373d779dc44bda0eb43dd188ac8f625b2650fdc5f473f609b390e3a35cb2f2f58af7272cc03d8810c6196b5849ecd048b779c3376ade26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ga-IE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ga-IE/firefox-67.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3e2ec6aa813351add3292f8d646761a5ba0c371f0017a965b0b815c9d6324bcdba42f3b585cd9df4a187f1f0b40d3a78dbd6357b4d46406550ce6dc52111be34"; + sha512 = "9967754d5dab1eb69a3d253d968ee25742f5620ee224ba025abd1f1ae563c9f85ff9749836664782c588e3bcbcae9bd08fd10ec614d435b315fea684f2e58098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gd/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gd/firefox-67.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1aa9d0bb86c56182c28efa5f92dbf58dcbc83bbc187bb942f5e418e75d586fd1742568ce5ac5871133cb0703f83ec2b49f1337dffd327aaade3359e740b50fa3"; + sha512 = "44327023cf1e4ca72c8f0018c5d9a9d7f372cbc58a26998ef76fc1564a8deaff9ec2029bb39e715ae3c38291b400761382c26ab26ec5e16fa12c041361c9d8ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gl/firefox-67.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "121f5f6c384283cf9002cf4f1bceed611e28d1afa837e2d19cbc18a0d6a7ca291c5d7b75d110005369cc491023bf84632f0919ff359ccd12ffdc449e4d1a0cd5"; + sha512 = "221dddb179376531facc1f81cee84f395af32e38c243c15dd570fc049b51cd9ce6daef9d5c6272a7ede8a6455422785ee59d081a61bb0814ff29a11648df88f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gn/firefox-67.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "66ec624b0b903a215659ef34828fe83cf64e7d43cf264624deae0a37aed9a0980be850ddeacddd8ac71b27ec6d1e635f43ff1f75e5c7ff13848220a27a23df4a"; + sha512 = "0aecfafdfb0d0a68db10de7300af94546cbdf3a404ab6825e050273b0fc4fddb8fd4e5a64c11d17a6ca02452f1f2e66fa346e2c31e9f67135a2386e76673f0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gu-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gu-IN/firefox-67.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7438de7c95068a4c84b57b49b86652641ef176f88c715789067f2e33edf35defc4776f2b891f1cce2813889fb4c03fe1c26110564f02c82326cf48cfde728af7"; + sha512 = "2210350d9201b82d4580ae737be85627fa0a9081ad1a546344a758bf06df806933dbd85fd71d914d3b2f374d6aeb1b5e2622c441af20076c00ae9fc49c55c36f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/he/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/he/firefox-67.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4d6675d21ebcafd60fc27971676d9f1d87823fd0f6f384746b7e5ed9ee1c4a3080cd1b93a7481846f2955f12c3648ddb18424749a1a2d11eb56e74232f9bf7dd"; + sha512 = "696c3425ee41206e7571398f6f985d4aeaca819b4bd606b014a66f1ab0c4c9439f3f3c0c14f5575e0b76ad66f3419c64709a5e9610e6128bcc94a9e9c6bc1a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hi-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hi-IN/firefox-67.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "fca993dafb56b59235a7935dd19e2241f3a4c81bf1d395beb971cdd4c4d3f2550c90a76920e55d5ace09c900599b48fd7f9a318fdf4e70f0ef26c7f937f0b3ae"; + sha512 = "a256bec2ec2c8f290cd5c7f49ab55bc113933e90a362c06cb57d67b8217b756cf1943f027771820ff880f9b2855b27faad1767ace50f3275fd7e2160bb34ba3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hr/firefox-67.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ea3fafeabb46eb2c674c4dbd53bc1f98badc09ee7cc99f2deee75e2f377c02d79c2c881361500424db5baf10afc016c074b8a0b91420e1769dd5e71dc39cab85"; + sha512 = "b08954b84e29e667286bb3169e6679fd635d38f4cba8afb8be08a4695ef24fd7d80a921ba769b4330fc33d649889be6aa5c661ba5b1aa5546dc4906babe489ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hsb/firefox-67.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "493379fdc37e29079c3561f26c5c211ebd4a68a5d7055e5089d0c25347d1f38252b5145f76a910868f5edb820d02d46c682a6226c97fe674ba2b37dc4ee4e39b"; + sha512 = "456fd6f04369731b5de70bc92fa7a00b32ed9d16cfa80d7a678cbfad7ab81a06f9d63c6650851d7b66fbc51eb74eeec9bf685be06c12e873e90b46855dedb10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hu/firefox-67.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "983dd20160987e94cc311fface93c64b8e8aa99373b0ddd09154e909504376173027f7eb05a96fc205c3e1668743e05001081bb0708c3a5ece02f95009f6ba35"; + sha512 = "f7670ea1b7e2a137de1f4788ca3f97b49ad19604987bea9910b7e46241244c67ca2bf6be12179aed93b37e54317a762d08d5d5f1714a923cfff27db5ca44f995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hy-AM/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hy-AM/firefox-67.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fb8759786a313692a7de408bf377614264b5af657ea9ce95bc7195e4075196c69801267913d1a2f980420785b9e04899d81231b8f00729c73037f9d22b9a6914"; + sha512 = "3a276983ab7aba959cad42a9c5c2769d2ecf4a9e781fb132bd6705cf787b0f1f0c3277223ae71ad57d68aa864a91e723c1a48a3312fbd30e5e8839dc6f5fb5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ia/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ia/firefox-67.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "1c7b9e314276e9e0e94de008ac928c2a8dba0fbe4255176643f9f7aaf0e4f7a2edf597656a0b656b94741b55300b850943cfca51d1e2437f84dcd6ed2884c11d"; + sha512 = "2fa1f3296562569721a3dfea681ad2773ab7c4ab41890d395aae13358f081b0dd7539fa49a98db1c1c111eacd451ed3908b3f382c57968e32c00445e8d0b8e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/id/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/id/firefox-67.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "52f31c787ced6ee5fb68f910f565d6890c24cb06f396a7cf60f9dd4832959468dda4ab1f65b874b46331a251679cffa507fefdb55803f531b41cdcdf848d4eda"; + sha512 = "10088c590e7abd7a55a1fc8b0604446581d41f492cd376bfbcda1bce04d5b0f55865a4271ceab44db0988e28652ba2da03570caf06ee1c6241f5e959f7e84411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/is/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/is/firefox-67.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5571678c28173936303163ebd780663a9902fb2c82df684fbc935b45dbd81b82654981de5ca8ddf2c803190c3df173d9edf7a5fff6faa23932bae0d084a1543a"; + sha512 = "013b1f3179269cb1f0e98f3467071fc6b4ac4ed6dbb57812f68df54457eabf07240101c1d00509464e3cd7db1696397901469d706780ccbe21c6ddb593d83512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/it/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/it/firefox-67.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ecd3509595c0f9229202b3cf45d50bc5902c1e63a8064cca77f0eb559ca6270fc49497448c2dd24ad775c0e229963c6aa76c6bb07736751a318f4c365839e276"; + sha512 = "a54971b746c619de3969be284dfc9215fe9d52941c4d1ec7e0d87cb994bdd4aa2ad8b015a464aa4055ef6fc00d9e97693aa37fecbefe6caee59762232bea6a2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ja/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ja/firefox-67.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a56268e5cd7f4d9eb598dfaeef7f9fe56e98aa0a0552f17fbf2c4e4eda4f64298f400d03d89bec27cb001db65aa4b91abf9aac0952f43c22e95f0c320ccb0f74"; + sha512 = "2ca7b68636506828120254d664701a65a381c67daec28c6f3cdec67af9d24d80fe1ed3f6b276f4de560543c9b5fb4029222a88207916c4132c99748499867d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ka/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ka/firefox-67.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c57e5c9034989a5ef6fe6fde7f179dce7a8b78fff442a0d3db93138d6678f9b4a74a8d5d51db16953a729b48b0b7530d29cec41f6cb1dad27677a759fa78036f"; + sha512 = "38af86bd57f5171b8596549d6cfc5b9580dad62e00ebdeac2e8c7f628b68b142221245483285f19c064eb949c972d72d36c160bf62960add24494cd31bf3835a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kab/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kab/firefox-67.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6b1241dd610794867f58289a7149038cc2a8f5bdd17f20bea99ef7dcf3da2a683079bceb37abca6d21a6d2c90e3406ea406f50670b189135cc656180c13a627e"; + sha512 = "5ddf9ac4621d1ae1e8b2c79c77428b4a4ed59a5fcf64043edfc527a69f01a7697931fc9713fcbabdfe93e4387a6a59c1bd11e34dc8de47678c0483a737c5342f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kk/firefox-67.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c0f4cf4cfc0894ba9bf48c29a8b27266c637d7d7a293465a048eab1cba6ab9668b8f274521dd670425a02282e073c148cccf7e265910f4f034b8edc1b704bc9"; + sha512 = "cf5920e7f747fb00ea907570fa842e0c64a02ea0ed9b31748bafbbce7de7a853020e675b422efe0b0a8286035856fd140211c769c2dd71fd7bc0af7805c1b41c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/km/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/km/firefox-67.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c5aa21d97b88099065b571f007ddb6b50f86b16d82d2ae699387b3618e47fd847bcfeb34e18d2c7d1a7dc402a5cc99885610169abc41fb5941b3fb0e959e8a7f"; + sha512 = "38469fe38bdaa42c5761eaa1173a118923cea15b51bd9adff1310dd393377164243bb46aeb390677506934cde142626b068326746d93a1bb176fb8185cb20cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kn/firefox-67.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ed574cdf851b071437bd21f68293db4c3dcbc6f259651c25617a64719e36dc34f22d43a3aaafd08439d8ca2f52ccc5f78a109f52de0c26a061e5fbc197990172"; + sha512 = "dbb5922c5797e4987f88c2eb6a66e3da9fb3a5c0178ad5a213bf7a4be1881dadba9e763fc3d60bcf594c3ed8078e28068931d063736ad8a02d66af0a45d4e96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ko/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ko/firefox-67.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2602dfe1c534f688247ee3b14d80ccc75d43060203e965fb6a28e659031ebf9c10621aaccc25cec62663f3b52198579a8d9db1be406d2cc99d54d1125177ee04"; + sha512 = "3f2541f7f7c9cc790057151143a7cb44749c40c63eefc246c77464250a8e1d08afb8899b66488427454d6756d1d834b05924a0c5ae3404b3c581ab1932e14aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lij/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lij/firefox-67.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1e3a78df80e259d0aa52d13ad3a47b65bf37ab4cc456b3704991726230bfcdb5429bd727f8631127f878975535154acf3b8f4b32b97ff815f3fd8efbd2d24761"; + sha512 = "66d1263a4782a9016dc88ca53072bc0c25378e483c2fb228320f0b0c5d40ca4c7e70c55cc219ad45b053a51bfbea0cf95b175226b9b11933a5dafe6ace2fb060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lt/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lt/firefox-67.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3ab5e09f5af356428b835fcb9e9e7c7a1fd710460fe42072bb67b3007efb3bc2d24d8013c96474763245d7bf806f762679e8053d73d20b6fd2b01f5b3f529f86"; + sha512 = "cf9d6090e722ca2b9f997ae7b4053d5931b57eeec0e58670b8661228261f68b68f30a0f4d0ea47804111477c76a9646547e241a0bb63df8ae00a4d689f65ab59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lv/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lv/firefox-67.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4f87af9f69d52f13424f481d8ef4109f74ab361c7056daf9b81581076b55b8ffd1b2f96fe8c6cbadf16418292e8c49d3149199401a4da519d1c1c29d6c6edff9"; + sha512 = "2f4dbe187f370868d52402c0b90e00d93d04e45f8181a532a2d3cbf318e241cb6702b707ba73c90e04c310d12c5ff3af928139113493bbe5f60e7e4946bbfce6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mai/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mai/firefox-67.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "06e3072e5b94767a3c42da911a322ca1a0c403b69cbec216b3fc82d1182403ee074f3b595b45aee834d0e0267567cf0adb97e99246e0aea233f6512f39b50bbe"; + sha512 = "ea694207a5546ef818725fb85b0605bed3e02b7a87c246669e5e4e378abfc29c2547a8f01c20bf2ae1506a46d3d8068e8109c2a3d75822eaa93a65911b82352c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mk/firefox-67.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b42ddc552556bf32f3f11897174f452a23f812877219bf0624cd0ced1f2adba1fd8d6ec8e7dc0c5127a22ee25728c7f73ed6cf7c876373f2e26735e1871bbc78"; + sha512 = "0f9aefaa8a15f51f7473753e8483ff1818f3d8cf914303709d0f7edc18f19d014c929d54053f0230029580b3042528378f41d738d6f53cb7a721554456ec092c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ml/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ml/firefox-67.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1842099651174a2adcd42cec08e9250fa00fe8e2c80044ee170f9ed411757a44224876ea270f4b491e81ba99dded91d07747a7043d3d43141d4d31bffb4dfc29"; + sha512 = "dbc650bb5c23fc8cbb7d944dca5f5811622b0d6c56db8623aff70e143d21b6f490f5df02f78c2973e2cf9f4f45fe5d7d826e6cedac7ea2d4da983067823fced6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mr/firefox-67.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "74b439a4742da28e1c5d34b3b4d7c8896c6910cf6a6088bd06b79fc881b98bfb2fe9a6f4d6f9a41acb7950dbe5e334f40a9e978c964edea7a34b510bcb971502"; + sha512 = "86bf49cc160c2edffb4a1f3c49c6ab575a19e9eb3a38d2c61a8d4458ec25264a5d1600fa9ca5fd53dca81767561345568e4c215b1b1511d381cff1c24d512d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ms/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ms/firefox-67.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "798d306eaa895e6d673851865df7dd2ec3a4f2cecb3d88d432de9ca710b8c67b00a75a070e5c736c0d86f2bd785fee515cc8f33a22a23ebdf593586fba7825d4"; + sha512 = "ebac0d06344fb32e97ea14301f1e40fa2392b7dee10fca1200d715f9bcce3ab6632d6945025475c982c9500303d5f1a0006648463405ad9f133b7187b0f92521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/my/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/my/firefox-67.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2ea262c2c96bc20ff8814880d25783ec6dd5ad8cf0abdadf0e4892ec49caaa1eaed05680404ccb74b3a0b482ab0593992c25a77037b39f8f081a6ce90eac57bb"; + sha512 = "bd50b6ac3d8a806b09e0c905e99c51f9f93948f5956cc98a8b7b897c36e88aff66aa7c4f5c54ecf2b5e69b9ba9394c18a9e31bd66874bcf0ecbb308f60a45d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nb-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nb-NO/firefox-67.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f49e4d833f29352aaa61c41f400edbb121675ca7bad615a3a65c8676283ee91f89cb505384722ae5326f3e8311dc3ca6330e86652ad09b3df11aa6f31b109f22"; + sha512 = "16227a6bcce8136152f9d533b7c700427dd3ae1c1649f35d30578275d752ea6b24c9c9f224279a68826300971ca2900e8d7dc75f74a2b9727f81a68a58ff3b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ne-NP/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ne-NP/firefox-67.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fa2da86e5751731b4d76b20d2c4e7e4313ef029184580c8298a66fd5f7b203508a3174db7733bfb4859eb146b9ed6b0699490210114b995ba0eb62ab85af29d1"; + sha512 = "ea3fd9a876b297f2247600741add6970162bbae88655973ca316fecda9051aba06544c2780274a53badacbee701d067b7252fdd656c15c0f5d100df97967bf85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nl/firefox-67.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8aefd6428b710df898cb9e637367a2d3ade3370821630230afca1241367eb30a3cbbb23d4dd6c816c19e6804766e8e84c00c7e3002dd91d80cae9c6b5c003523"; + sha512 = "cb7001a2f345352f3e8ad0fad0f01622bd31a94042e59910fcfff653b46b6edc13ff2a4922f2356f0eca49d1260319b615c549fb383469798ab79b837d5c6c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nn-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nn-NO/firefox-67.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e1ee61f29b915ecfc514981d79be115bb55981cd28a10f7c268f4e3a8cfb80524c409950a3b38c16988ccdbe5eeb333ccf3833cbfc5b3243f08809ac79dbc0c3"; + sha512 = "b31447c4218a9282bb56a28a5f7a30d04bd4e08a2184d3fc275af2d42b0272fc2e035f4b8e433237661124675a854f87c2c63a5ce86567b1a5fb439a43e607df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/oc/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/oc/firefox-67.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "802d59c2d9a037140d22e62cc06a122c41bdc0120c54be6654de0237344ca6865d1741fd852e3391fbd508015c9fb4c98d4bab46b028d1867b61dc9eb900b60d"; + sha512 = "d03c239d7fcf3bc2c30376d24c9f12ce7ad90c6f34f9582d24587bef9dd4dda9ed7fa1865cf88198cb564d5d629933e74f74dc27e5c6b3ff0c2e43331660a9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/or/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/or/firefox-67.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "c97a7812ae5992f5832c3c3e456e30f166134f09b086257e78414a1e790d19a2a5a8871eaa2fd66b0efa30881397bc29e207f5840dff891a27a1e86bb26d8ff9"; + sha512 = "ad7378d6de429e5f23cf77a86216f4cc87f5b94226aabfe218ffbac19046517a1b38da7c41f09a5dff11706d1a9c5810adc296d6988b15fa3dcb9115c6152dfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pa-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pa-IN/firefox-67.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6044da60b8aafda769622d9069ce10916818f1a266e9457d5373043a8d58210a822e0091450a613967d2278f2817ce24daccbc1414c963113265f36602e34e64"; + sha512 = "fc6b3a79dae9dad8d588463bb989456e9f660b4f88e0af7c3bc7104667f9008993995c6fa8cb9cf85cab270751a389eb7d51eab74208a39497a1d31ef1dae353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pl/firefox-67.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "59cd02ad97118540b52aa981167604e82c5ea74af22665be63e7dc3e01a8a13856810c293d04125d015306445dc5693b5fabebd62bdb04db4dda09b05db81078"; + sha512 = "a8a31bb6a35bd28e7523a79b8032cba69eb90757840679c6053138d2a5dd0bbf05baaf47c7610c989527df4b85a354b6c9951019d7d194071d1a0c2eb36bb370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-BR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-BR/firefox-67.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "987f650e38aab5d59f4c84da3830524ff0e141102649476fda04349b3960ac4142e9731a46da6457ecbcba00e402eaa5c0c6ae78189c9b223bd0133b823c887f"; + sha512 = "0313e7a037b3c0f0f5fb9a6e7f6cff432be6561be11d97dd404fca613c31d623fb40b6d32e9d2ce470ba8957501113f4b1b72cafa496376909a737536139b587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-PT/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-PT/firefox-67.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "06ce2ff205d1e14174d9dbd07f39122b093380c22fe74661321a734882e9232138bdbaddefad598c9344dea8bd61e81ed2c0bcbd2d09df616a05486635e99ffe"; + sha512 = "d560c41760a411fbcdbf93037ef630c4ecfa9aef4e63ff1ed0441808d927c995755e22db22a341b3f05dd00cd96644307b15214815d45c23ca409da62968bd88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/rm/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/rm/firefox-67.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "75f5b24fa0ab6b069a25ca568e2ad70373762e03353c7340e4fd849803360229f5dd8cdf79bb71a04c047bcaa63cbbddfef71b35d9bcad3f8d8492fbe6b88847"; + sha512 = "49a56b51a2d047aaccebfd6d173ebbbdfadd8d109236525b591ea8869e268dfd6e4ec297b08b9a8fe7249b150a948093fe6f148a99f9a45fed5aea1fee988454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ro/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ro/firefox-67.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "acc557c9634f09e206478e4cdff36e7af4a70c6ae25dc9c92f15143b4239bf20291a0e977c13f98137457e97601e164a0e1ee8ebef387acedb1f2e1cbc2429b9"; + sha512 = "857f59561bdb90ac7391996857fac28e52bd20410223331fc34f176c8fa5aa9660b4de53be6f0dc7ed4b980d7f25e7a15ea0c2512c2e3f10c28de987c30079d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ru/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ru/firefox-67.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d5c0e11d622eb0f5681b78cff605437bbf12570f8c282ef8cd8fee405c06f7a42a402d27f784b4574828a0ba320cba4849b56c0f639c2879682e0cdeb6a05d76"; + sha512 = "9316846515c061c4c5a7db307d30be924b44f272f8dcaaaf937961d8a9e0175f23b02ea65502a9707c45a2552a7fd2346c1642131652d2ae1d7401a7d676640f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/si/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/si/firefox-67.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "75ff287200ff05afb435604987ab56a6177f86954c1233e2d91a24c9529205af9b891b771aee02c21ff09adccb90d49bbf33c1452d5921d4664ac3575d69578f"; + sha512 = "73a3c7a9caa64b5c3817ba41d9d8fbabc5d6b61bb77cd5e256767614949074b562f560a9940ee2a64990305c48e3da7b02017170a6357d49c176388c2544e38a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sk/firefox-67.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "485d0ec3d88c3f4afbfc8e1a7171b463d8596efd85e24a17e1da71df747b48680087532d8cd0d86bd653d6e0a3ecf2ad0566527c1448a6cd13d4958c2ad8e582"; + sha512 = "5933911938247063e788e5337ff5cda9798b96a52d69fc98335750544e692f5b49fd6ce2a3eb5b9c9602177b698f1c7b8ca16f568b0fbcc8631ad13008487d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sl/firefox-67.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3453d03f4b43889409230ac85918c41b2c4b28b17a88ebc6e3028e943ac840ec13529759f01b55beb69b47870eeaef54130b4407300bb7bac5ecebb9d9267459"; + sha512 = "60b2665da81fc9129236f6dc2a43a0f6c0f515629f825c55bd1cd93a851dd1fefd286957fd7c87fa81dc0238d192374016c78a737b3b74c85449777253752c99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/son/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/son/firefox-67.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2585dc5818fe8fd188876319aaada09cc570e2731b70a8948d733f49e878f081a999a27e8a069c2fefd89ecc78d994b8e16b00758d606bd8a6a326e70f09de32"; + sha512 = "82a03a13055a54c3136688d1af7aa6ed2742de18f15b718757dcaddcdbd201d2da8260728bf207355041598091384b5d74908dd2e801cbc3a153ad5984cfac36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sq/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sq/firefox-67.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "bb1ac7b25f80a7ebb58e989710751c168014ab4c40681078b64df26ed224908acf6d0248d1fed9bc95d8719faa78624c45636da30a79916083a60ed2a118d75f"; + sha512 = "6a37ffbd865585b370149193675a4b00a69840928bdf1cf4f49fc5242094e3b786f45c8ad1fdddb2d8ada62e2dff79e7d93b890deb76dea042111cdb57cacc0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sr/firefox-67.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6dd2728d54df09705d6ea4c3e8191a125f0ebc547450fae8fa24fc3430afb654d72992b91267f1bfda5f11ae89b5f653c0536ecffdc019a228111cfa530199f8"; + sha512 = "e35607297ccae09ba650fb0f3c1bf68d276e29db8214e79f096baa1f91be0a11bad66bca7018664ae1d17f66977f7bc7c12f9d7b045a1305c32a9ed8225ebea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sv-SE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sv-SE/firefox-67.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "086cf49b5cd6e60661e1b89eb0a1ccc33365bdba7e52e04432256be4975f27d58fd4d3996a27c0f63200d4d925328c5de898df7a5071200162545e7fdae6b962"; + sha512 = "364d9f71313cdcf42446d376c5e9a62a7e9941f0cbc39f7c6cca1c345411269f05bc04dd742473c12123a21274ae165e107c57be24a979e685f4462de8763b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ta/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ta/firefox-67.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f00490d45844a44dca5fe498771fe9490c56ab7861a93128eb6d55f09a4e9d77266023e0c6fadf1d121aae0916966c21bae30d9126e46a8d4f8d33c23f16671a"; + sha512 = "e0138b51e033afa84990105bf02efe7eb73ca535cee813498daa08c8c775016dcdcbe508603abe520537525b09a914044396d150f25ecbf59fff43857d27901c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/te/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/te/firefox-67.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ad10c5e4086d50e793639ab3c0cb7a066c5bf2627530e54a1954d15efe1ede3df900b968a545c3796b16b3a78176a668b2067bec09c230fb48da3d3b9c0144e1"; + sha512 = "d549fecddfc85e614e8d3459c7b6562040075c2d4cacddd07f6c78fbace5410ca3ddd97cabf1770779033f03cf26ba97bb9ffa32c1622d312e66f0d2a397bcbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/th/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/th/firefox-67.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "423f4aac98e178b832b99724d34e48ef4d552c8fa8e0a3e7df60732ce13ae4245a510305309507cbf86d0ce74ca06d81001b3b033912ccfdcb138960848cf038"; + sha512 = "88f691d2f7d7c609f420a9e88077bbe69b70fc776f56789827db58c9d2042c280e21de469616eed2223e47250d65276cc9b820b7ffe07eb352ee72960a00d626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/tr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/tr/firefox-67.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "8f0a5ebd69b011ab3c8507ac7e7211d41a449c0b49c63a484b7b79159e46696407cd8f96387b043aa4c223a4021d5f282a6b19e95fced18ce1cbbb494fc47118"; + sha512 = "766732c13e92f8e7480f8b866d6c744d3f8eccbfc3afaf7e64d54553c2a720e082a062ed4e2e852fb692aefc0cd20b67f9c74c5dbd9703e22399be6bd5044558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uk/firefox-67.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2b9e0678eae4dd1e920b3faeb3484441afe0327dd7a1dd42ab0f89ce6b105e2f2856a62789a02f90b6e81ccec1d295116b73b469dd6eb734dd929b5409915043"; + sha512 = "e9b335a6b6e37c5d2b89f9db8cec648834ba999921f7124878a324711c71b3c0320845d66285e6e6ceaed0afec2417f2c60b43040ef9f1e3101f8a25e23b4010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ur/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ur/firefox-67.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "68676c3387141a73060702899e7eb2c1ae6bde43124f844a5909140e9b5b180d4ef226bb1785265f406aeefffc7ad3b56c89fab12d2e92e41f0cf0e08b7ae691"; + sha512 = "612c52dcafcbf0fd6a5093eb622f272907087581468f8fc0b8267df22338d6381ab3fce1a7529d782a6e8d65b69f44fb4d004a6d05df18c8ec2d335958b0149a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uz/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uz/firefox-67.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4f146ecb3c9428e6da96c8731df491693bdfa3aafbd3d898aa349e025baccca43514e831d97a54d195c610fec5e12d3cb3ab8763fc5a1e6c2cb210e5de86ab1f"; + sha512 = "f5fbf80cdd8ee76ad0143447072ac3001ca3e319a23df7b064794088a80b0f3ab5ab2420442db75adde0cb8e1ea926ce302cee04dd99be053f3a1960abd2f159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/vi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/vi/firefox-67.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3cb5572bce606f8ba96e3fb40abe943dd1a5b809619ed4c72d9f645deb3af9e2da198cf1c6f8625447c5c63d4d3cfdf7a093a6a8d6ab58edc179c9763ccf942f"; + sha512 = "25eb2a25aa2d402be01e28bc9586234c1bcce6481420c3905e96af7eb89eb4f4417f899ee78ad67f5c8d089107f4a9b653748edb496a9cc1c2c6d4ba19e4d59c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/xh/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/xh/firefox-67.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "13d182190781c091de4055a3758dca2c35ca070a570fb48714585caf1e9306f81b98d95fd321675b9c946eac09f5256bcce396dfd9dcbd3c0749a528ce08b300"; + sha512 = "c4d2b71e81eec63993ffd5bc554b7b6b94c9835ee2b75df176c1ad441b57c5a214540c5907fbdf4b7f2f1a59383cdc3a1ce80e34a4669172e2932f7098f777d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-CN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-CN/firefox-67.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28e1149f5cbfbd81871a4bc817f6ff1fa01d91ca63625431568abad1851373f402fb93cac8458cadf66bba7fd616c7488cc2703b524fec0e803a474c3c70fc5c"; + sha512 = "25b313f892ded3dde838c42fafa3fee85fc655858b9703755c90c5be6e625e5ff8aef61fa9ccdca1f09a2682452125297dc39ef44757fe1e6c8763dfbfacf237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-TW/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-TW/firefox-67.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0c6a7a431c2d1ba3d3b437f56c68914aeaa405e90c05530f996a1448266d0dab1193921c11291b8eecc32f194e24bbd2744ccd8502f36ba8de074ab6ddb7b605"; + sha512 = "a6d2038f739835f9dd0fcafda6dd0f13c8a32c4ef473f142f542f2c3aee8c05b6a3465f3d923ca23c540326eca60ff0eff1367080ceca5b4505cbf07c9204a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ach/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ach/firefox-67.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "143bde45ba31f2ffe4784f05d9b78a58644f6e8dcf85c12261cb542346352130bcd7c7cc3fb8fbb537af096902f8594ff90731fb680673bcf3902ea7e8fca165"; + sha512 = "86c96395c9c4a80e2afe326e861a5e040ab366cbe99ebf6ea1953feb28a8a28e100560f9091fb653a57c5a03ac5f64ba0611b30f3368340360e740ab1189da02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/af/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/af/firefox-67.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "93b15d2721533f3b3b2a1338119adc663785b82e3a48549c5700be522c03a00fb46e8413b31c2ea39180cf8b2b7b4a3a7c766daf1687dc389a9bb314b744aa0b"; + sha512 = "c20d31426850f273ce37c2a9e358c65ddbdc49918128c3e6d15708f71efa6d013cf03a1908baf5f11d6807e7e6a4cf81a6105c707f1a605d0f41004c2421d3c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/an/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/an/firefox-67.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "61c2b6e8a028a6af70d047d35fbd14b25d87b41d3651456f4e4ce151560e1d8618654d31ace7a99eeaae6c7e6fa438782a2ba3826476bdf07664a6fe11ab8040"; + sha512 = "e73bf9f56f9c8be190152c25f1e4c9dd774a83cd8a2a8a00133529f9f1babbb6cedc78155b17681fc5653653189d74fd8dcd79c8755397a1879241b1d602d82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ar/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ar/firefox-67.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5d41aacd05ef2c548e12f8f8ac9c9e514b55be400a1de82709b27edf3a0a31778a40ac01e63d170b423c56f4a9a177d7f4ccf511311c1f140aaaa259eb6b3273"; + sha512 = "3d31cccf9abb583557789f0c6a3b0541072fe79bea42eecc27915f4b67a589efcec0ad6cc7652520d1b8f4fb1f16031df4b8d005d361e7e773088d163f550914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/as/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/as/firefox-67.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "8e92abcaa8bc2b891446551db5377066a4ff25dfa76e5f940e5f0141388a3d1ae5ec57c350a45d655ad573da28d99f465721621291a049d93bdcc20f8799b434"; + sha512 = "08107142b1702e0d596e501d8bd754e3f76c1fbf1db3af26eab17990f224e7bc19415cd37753cdf8080413dedf68da32b500e37b01f70147d1322d86bef42459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ast/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ast/firefox-67.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "661508f7d31d3795eeb0859289b45eb9efae70afe714153beef4dd9af8a981aec74cd2a31207cff95420b2ff2485b8ccf6bd104e9269efc08710cda1ad9e0f43"; + sha512 = "5b0ea06830da459ed9ca585df130fe116de7916010051a45edf7add136ccf1e058711bbb94e376a4c32bf42a7bacc0ea2fbcbfe28e8718de2660e31c5d9418af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/az/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/az/firefox-67.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "518cda92119d08b6853e55a2897444cb180ba21f6a1d5800667612dc56dea3f025ae6dbdd3f950d07c9fc7efd5ef3a4a0c5ad1de40734bf4d4e7b70c0bae0889"; + sha512 = "55c8e4c71880441de9c86a8fea4f6401b7753c25ef4fd4af968e3b29c6334fed635e232d7cea728087015b7bc268358284b183818e38f388d8e6648803d4c49c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/be/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/be/firefox-67.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "36d328eaf96c904b04265c9f66eb009e9a7842a1d4848bf6135b46442b91aaeffeddf5595fe6cbaf53c6c9fa9ade1beb01726da08cdccd0444e8182bc61b74b8"; + sha512 = "904257df324a2ab21703e314a4df6d354f2a462f87139c861a7d4836fb34016e6e6319c06f6a58d76d20fcac9320266e5857b46d90c67145f44fd42442ac94b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bg/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bg/firefox-67.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "387e8771aaa032eb51f6db15be9feb897db813674f7f8444e13fee82cfa2ad108470d684056b4c858c22e35b91e08cff7f514aa36157dc3879df3c93bbfaaa48"; + sha512 = "bd5ab542b9180f9ccc998a7b47193db902e30147e863f298e57c633c3a3da44a44c6ed40bf8c7493ddf02f1c195381c1b632b1ddbf7d6050a032fabba5944d9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-BD/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-BD/firefox-67.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "70549261581856bb220473da33f605401a329cafc63ffae697cd2dca149e4a55d2440539e97e5f9dd1c781c9c39daeacfe8027219dbcb6d8dce81aca5a50c737"; + sha512 = "be04077c99b3b3af610ed04e04cd4454b4011458e50dedfa5858808d76d1764c5fad4c1d4b70a32621d21449dbb78cbf266ea2bef05c5bdf8e84cabd8ae62490"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-IN/firefox-67.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a9129a26e2c923c8484a3b1b1a20b5330cad29f127222482b771a216a93bca88d3fa33e42fb8c39edad61c61939be04f362888b09d483fda60b5c97923abd828"; + sha512 = "fdff31833055416147bf4776246313868632a4dffb6ed729418333c8c44d1963ce204e0b266c8a15f9785ac5f8cac4c1d19fd6c3626d334e86678d60d8d1f1d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/br/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/br/firefox-67.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f809eea506327ccfdd9d816d7c0133e90154ce5b4c7209748fd9439bae2b28a265087804fea7a1ad7c5ee810b41b922e196150e4fb7b5b8ef6138420313262e4"; + sha512 = "b3a36358b2e759ab9fabb8580adf53689bdd26ba5aa432fb916cb91c27fbb362fa000ddb37639b7a7355911ff398395c4d8da2a67d66bf91fe5b34b48f9689eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bs/firefox-67.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "12973bb2dea8bb8c2c046e45e63b4b34d0a49d067703274cc32fbb9ecb44a8919361743269ffbbc7bc7716bb20f3696721c4aca41b45fca68160e308e3934a10"; + sha512 = "a2a16f68edafd37797248a33a2553c08958e279ca7f6e120b436e577c238ba9333fa0833a5c926c2c8baa77e4cd7b8893031c6a45648c1de6fdb81813cf83c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ca/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ca/firefox-67.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "25dc6fb35330d637912656f9f1f813c6fe742c6f603b879e236340e073c056207ef59c395f2aa6d6a3aaad2ea1b1f8aba97602597b272af0695143ca3181e64f"; + sha512 = "74766cf52c08ef32a4c2b4ce9fec440a2cdf28dd231478d5c48c40ed126d8ab76d1cdb5e69169a9c104c365961eba99fff599589be7814097c476943a9514924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cak/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cak/firefox-67.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "0f9888724bbc7157a9838db6f58ff57c93c527042806c3697d8ce996c4d059cf47daceee6a39e79f1a4e01d8ea4c0a1101808e5eb2d99c5fd1092833e4df55dd"; + sha512 = "61445602835570c4b93928c8a2cac4f1e06d911c16a7d8c4679b23bf4c54a7fcbd387ad7e70adc1fe837b28cd750404f2a47cb442cca766a8012136c98642b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cs/firefox-67.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3c9284275d4fac7697ffe0790ba8b7cde71f3297f78ac5467261f47d588ab620ca370cc349ddb8683febade9a4b761acc79236b7b1bacd18e819324ffdf61964"; + sha512 = "218607fab37e58f05dc0544dd1fc680da18ba8836ede030c8e551f99d574b7f5ca651a1c4e25cb9879bdf201bc1f3814d29d18b6014aff0d7aa1d7b846a992bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cy/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cy/firefox-67.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e3047c59c710ca0f189c61089caa86fc844514ed8653cec9e64f5ec1ce81466890c5e565fe6790dd6d7388d8e5c48847eec54d42431045fd1a1de056544e50f3"; + sha512 = "1f74149ab335f37643545b6b46bf7c65d2b833993ee2fbf207c96a372989b724f81cbb6042fc11bf2eda36893ccadbd6f464c7766bbbf5dd715cbbabaea64b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/da/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/da/firefox-67.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "689e8bc5b0b93658da2e5b873d799b2f3f1548ef67f4c082a07d79918f6c7900b0aa00c84a115279de9a5e2d8f2fe083bd14476b111d589a610c539612d3beb5"; + sha512 = "3d0c84d3509ab18235a6858361dcd53151e23eb7431e32ce15ed241105e552374d843310eda7cd4bfc32ec459c367b2a21637dcd57b61f57c6a61723fd1fbe10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/de/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/de/firefox-67.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c4a17564458794710f52eac0e3e7e5fa3416fb278bd1113270b70f877dfe105f802a5de611d0e0ab5d0d8888dcf6d5856211a34a8315a039cad7516effaf8eba"; + sha512 = "15c16a024f1a5f1d633dc3c945316e6df13335199c835f5da6c55061525c84c9907afd66c77012720fa75ee98be0417cc04a40d3045f373e70a31c604507bf28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/dsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/dsb/firefox-67.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6e52744b4d65ebe711dde2c7f5e92243858d1218f18eba1e47b6bfd5600668fbd36ab3edd0a0780b6682354c7df5a2d3d0202263a0768dfb7be1f3469e1a21bb"; + sha512 = "ff1fb6fdb3273e8e9c67b0e35bd2f75ee70621f805efd4e6a47eaca3ad59596e4fd033693c5988180c1195fc0fa61aaa676de50ba9c1e7227feb722d61a08543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/el/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/el/firefox-67.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b0fabda2a20c3a9b0e957987ef4c859049988cd959331f83510b13c52752867722fb6fe99c6e4fb18a54f9ca965d34947bdb3aed6ad007ed41ce98c68297735f"; + sha512 = "504a164ab2d2cd3d114455771879ffbd6d6608dabdf8e09b579240b1e566c6763f457c950c080889586df03ab0f56329ac461bc93e161ac26918730563c641d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-CA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-CA/firefox-67.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "3a3952783b22490762054b0fc6bb73d15f5c4faf1d208abaa8f74ef6ca9b829594fe9b2e1c57a02df840eaf640dea09c399e62a93a2481e6f35c3271443ea1eb"; + sha512 = "0f6c00e0cf12a7342609a8d4bf13801abdbb3588c9c331a44f155f4668c6ac167db8de6baded6f097c7d30c03bfbaa60d645429459f6f3b9dbffed14152e9b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-GB/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-GB/firefox-67.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "64dceee7bab4580299ab32aafa835ab0cc0ebc8f9326e3b933b1d74b2ee35ed4a95ed0d896c38cc0ca880f5ac48f52019b910e9e1ca50d9eefc17e5043f808a0"; + sha512 = "c0195763b147462e8b4cc70617668475c1f6eeb04f03bd1feb76b1c7f10ca390877757d6067dcdba6c487ccea8e343eb1f5d4e9d7b8d5e24b5cde4cfa8c5ae8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-US/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-US/firefox-67.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0c0579498ec84c12e2c90ca98c79021e888de449d031ca4e27c7b969934fb5d63b997153947b4121eed7046fd42f264865d6a3cf40b4543fe3a2f7880fb0ef4d"; + sha512 = "ae8ea89613f36febe3d0fdae8267cb38a60a2c08927633e96d5e8f7d223043caa5e96bcf2f832c03c0c183b94043f7025659cee158e424aa0f0d9614638afbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-ZA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-ZA/firefox-67.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "fe1331634800d62ec69cb1e1db48377280590a0629f6099af2e5671102fa277409a8e682139494ca57618c2cdc2d8f1a4721b6b495d10b1d775ac22c22756b4a"; + sha512 = "da8a2606a48587a681b7b70ebc8951bd66680183fceffaf1a37dd677954b8514f68eae8ecc0f193c310dce9318d33cfc86a3728f3c49413ec47a1dab57a8a1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eo/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eo/firefox-67.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bd5fba6465a78e821ad1bc15e63cbc4a5cc3c3bd9b9e44e9cabec05d0443d68cfbd4571963b5aa01c9124c1828f493f48d043c18acd6b6db1b5d9d339e696693"; + sha512 = "3a59f30ea0c40e252ed70fec0ec5a6af8b7a9632653dfb3cd8a10f5949a238c0c76de448fa133c0cdc3862daf92146bb5517d1ee808f68f66e84052cbc05cc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-AR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-AR/firefox-67.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d0be25abc28e79ac615852aa04b71800d07bef55f1f279540bfe198546ee6f0483dd4e06a9f23215c816eb4ee15d79730178dd54a2aef8d1ed5077c2d35df470"; + sha512 = "14cdd682c46aa0c4a26e4bd53dcee1bf43f82f8097dfa2cc33d82d43cb15172edab2ea55b604b805eac5868e68637ffb1a0e925ef0cc7c8fc06bfbcbdb4828af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-CL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-CL/firefox-67.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "636fbde6dbf8244652f4ded0423b708567817684aad648ad682371b37d70694444355398eab933626782d5ffe2274cebd7db4c24587580b7d5edd213b9170bd5"; + sha512 = "794f81e4849c307432303218b00e0d8460c3c25ed76ba0f695d878faf76a6085596384635061da79f8fab2de12666a30ae6d8a5488fb21b9a2dabc48960a404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-ES/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-ES/firefox-67.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6c786ca9432d8bc5453b3558c0863953457f1f32f4204cf39250628f6fee50050b1abdc0d0478600f497d3f082e1cd9f5a280db0202240c3f66dff2870afb9c3"; + sha512 = "358c84597f7bb0eb9af602867565e434a5717fce18b3af2e91d0e65f9620bdbfa822be3d09f05e48ae6f416c77f88d05845f11801ed94477cb76e5936d7b5420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-MX/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-MX/firefox-67.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "10bd832885031e67caf6495543bfee9d9e1e9f5e75c6dc34aa81d2f9f33fb89a52c2fac78e3c15ec8e2fa09fa1e43cf07035a2e0ea9e9a8d8ec21343b9ace36b"; + sha512 = "3b16575332be2872682ea81f22c72b5a0536ec266e892f0820d387ce3adab5f68168de43af27dbb7a1f062cc1d9822091a7bc6e58907edc39d8e1cac5d250fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/et/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/et/firefox-67.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1d3019bd7ee02ceca29b4c48a9f41c89b9836e6fac0d1025ebab2a8faa4bad5274c13eb81a1a919d490ee92400d2dad480dcf7405a2a3094273179256d9165d1"; + sha512 = "47079c0a4afdfc3545283f755c75bbe4ea48b2e0d25f65d5ffb9b3bc5f71eb6015f9f0cd62456042d1df123c8ad0eddea791eca4a91ab30733a53679d25e6332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eu/firefox-67.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c6e8c5e9d0b41d51b948a3b3a4a20502392ead14e45ac8c559bbf9313a9d6d55f33f1eb6162918020d7786db334b7193e00a4661c44fc7a3c3b7121c4e708fb1"; + sha512 = "1d95f71b8a83a86743bedaf480b2a916a8b525868c7b9ba0ef03eeaa3ab5147ad75103d70e7398727a79547bf7794bfa54c6e10b6995c5d0aec0f3ec2d703a89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fa/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fa/firefox-67.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6a0b16e81d926f9b52d1f160215e78d4ffac272dff5043433c372f902ac6c031006ad8367baaa815da766f703541804ee088fdc1d4184995f3ce5448860baf6e"; + sha512 = "e87c62186d950a8f89d6013ced127cba0156a38caaf6bb243a7a91f484b424239c6635000d88e77a17a6a6728f6dc2574b55672c1a79cd216a7393a795b67b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ff/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ff/firefox-67.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "65092d8889426a7966af531d0cb6df2cb7588cdd0bf8d79102772b0cb48759d2f611d2d7cefce7de85cb799fc5b65fe6fe80b3b10eb00e53328fb14758a01072"; + sha512 = "8fe3080c8bfc3cf6c13bce19c7fd143ab9d98df4f0203b4455664c69988159c3acc55179c628c2808f536c0e3ba16e8025a1be746ee94c7fc4c87dc409094d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fi/firefox-67.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3e69f8af10b5061ac183a53c674a1964c3840b3532e521c2c31acbb9d665ff6fc25f82c90c1c23aa08bbe152628404a3916a786b7fff0c693e3e9cd0f6baaaaf"; + sha512 = "33bd1973c034677a690598cbfe59fb7c03e7b60c78e28e86fa591af3183743ca2ac039afeb08ea17614426611ad09d2876cda88189f551f3d6ca2dd2ee963ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fr/firefox-67.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "40e919128406b91d86a64c7f1860750b17e3947d8bb58ac0b6b308d3b2f87ee946d58d250c2e735ecc0dabad844e67bab63ff7a41401da2a852f0f56ee28a1ff"; + sha512 = "dc316f3868d908f2313de8ba25613a3b5996dd158afc87e651130ec27e830a249f64bf1bdfef0b99952470cc895fcdd3d41ce336dd7a835da6be9278d8f25dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fy-NL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fy-NL/firefox-67.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "24ae60db18847e9bb877d512c6d30b14fa31c855b9ea82dbc86c7febb5f80fd0bdb1badf4ac1cd78f287f1a0571a07b85a207020d3441bd0c9454e9d917ca12b"; + sha512 = "68b4e73d79ea5e55b7a4be884191dd011974fc90fab48e6bf625fb03634c543d04ace2cfb28daa4c05e8bf9fb5666f7bc73f0b1de4c8bf36642279a44ccbaeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ga-IE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ga-IE/firefox-67.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6f44ba5cbb8430533f1e3ff2d1b7dc2c3eb869f54eba387bbc9b57b4f14d0dbd5dd8491190febaf76899c54805274484a993724b556ffa728129eef7a4b7b974"; + sha512 = "cb0b37808e36fc36c060b70e7c54012c49a6ef1e4a051fd8548742f8afde45dad0a2f5b6936cda2cd3df1412e72303a1e96a3131c50fe3926b25babf58220e6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gd/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gd/firefox-67.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e9691ce54fe3a0f9c90a90ce5ec9b6fc9c070bd55b3e852e9e586fe60d7358c9bb0c86ca2f0e0e305fce8df6c1ccd9e190923ecc8d9ff1125a2075c1986ceb81"; + sha512 = "eedac3197db0d0165ee953d9b7d2f85508c66600aa68749040388a3ec84d9315790b8bece2b64891a4afe3e9b333898ea397bb1b31cba87a9f2f4d4fd993f852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gl/firefox-67.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "27954989bb8d11c984a621b17a4468be77f481916974a63e4dd7ab38f43db8352c5d77dc200dd97cf5b6ab7d169e9960c9d202500492914c8b24ecc8bd2d6c4f"; + sha512 = "34e36d460877d0a6f9cf267fcece3d2deeb0be1646d0efc49f55554fcf814fef831f9d16b7814732f360196e7f26b35bbab37e8181d0869ddf4ce6d2ba2f5f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gn/firefox-67.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8d4c7b80cca5cc6d4cf3dbc66e56d62c9055b8b2c6050dfc55a52b1ecc835bf40027d22cca12bfc507491e75c1b29cb7e805f2b340a2943ffc89b0127a608b90"; + sha512 = "e40ff912e46f0765d336cf275d90c18ebdc6636aec3ea445b19c1a4a14384143c10e40130e69c7d37011680f080d46f761edfb473dceddffa3f3008893560222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gu-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gu-IN/firefox-67.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "39e8905fe88f742d0060901dea2070ac8ead2e4e3916628166a5b64fece1a16db42aba347cb4b346d147c95cd14e9e2259abe80749c0f0a8a837ac49ec66057d"; + sha512 = "17e3a0ff17642f26096b8bb54bdfa74029bd867ba22330114a8c002a4c22f30a3c4550591734e238e3841976e4d601279b9889879ac8d9a88d353926a66f2606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/he/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/he/firefox-67.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "24e04866088fda3f66e43d05f71baf07295409714f1a51a4a2dfa419106e543b42ec5be7ce27339a0d65ea8ca084695e97aa4b3226293827aad6674026817119"; + sha512 = "00f7e08b5e03c01a67c71bbd3adc3f1cc2e0ab783c9a735201bf4ca868d9f4ad2ada60faa19283f566ad6a7708f9483ecdd6758f07951bc05ca50d0f6de0cd77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hi-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hi-IN/firefox-67.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "cb580cd596cf6a6f3e0b9fd83e47362732ea8f2de2c9535800172949320562b862b29dc0b653d17ac44959a78b99f2636a5e28a57a00a167bf32c711f9ba32a5"; + sha512 = "54329781d8a5b165b73ce988a79ce40475b18434870c8d5b46e114023e8b7f8eeb3ccf4bf198ed6ecb5672076a7c90b718534e9007ec320c6d2de7437022da54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hr/firefox-67.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c319352e29cd1ca0627d7a3332ce9a9afc29a8ec447f921a9ed2a89a4722ac43f21bc353509a15257a139de7e56652a2cf96fbecc38cdb860bf59e7ff3e282a8"; + sha512 = "40f4d218ff0d2cee43d20e45c3f1f66198fc5f0e1c752acd8f8b497e2add4817122ca90bb3fd59c38d6ab5279b2b2bcfed08a7125a979999e003f16d9e835019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hsb/firefox-67.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e04c62c9a7fb273f43efc066491fe32a214c5e8bfecc527508b5d1a6ef1db7f09ab045a913593ad98bce8fc2af1f63f1fe695156018181b3b834b7545cd17621"; + sha512 = "9cb156d9528cdc125f8b532e484a4bb8d6b3d243951c3eae35519257844d65435b8a6a0187a6570ca343e815f79ccb78cc6ae97d3ba2bc2fc3a042f204f5c5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hu/firefox-67.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "af69a29e22f8d6566c68fde1e661352835ddb3de87ab80e4921ad44a1575af815163744f4814bd761b52075474d8570152b0bcaed753ac9bd9909baa297d6f00"; + sha512 = "6469af6883cc05a9f2f97a1cf0ae3346959c3d3addf20c572a34b8ec082f3a1f460d6a84d39947a1663a98296652726d6818a195bff53d7100995782fe1ab1aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hy-AM/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hy-AM/firefox-67.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9531b16c6f7a369bf435f9449fb898ff8eea1d9d1a6855f56f01fff6fd47176f367b21c26c2757af0874e3a88b948e4d3d14217c92a49a5d4831313a338b1c15"; + sha512 = "d9d1492a7a3070e9d5466bac8044be4c5a755dc9a1e3f619ed4c1a5c553d3486b8aa195102d9bc722c1fc62d173a49c6e1f21b26d2bdd50ca547d3200b8b4739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ia/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ia/firefox-67.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "387466e7e270bd907402a9c323b2766c82fa0f04d252a21513f71acf3f0d159c479b895fcf95e9287ea0a9366fad9e04f5fc67aa65f1ccddb16eae07e3143105"; + sha512 = "c387e44183caacb7c6bd8e6a525d605f5c1058feae237906505b46a0cb1a82df916d2ee1b7aec1de13ff8e390835cf84d5fce1b6808f215dd3e164983501db19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/id/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/id/firefox-67.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c5ba2f9707212fe41180cc1a8fb987b03d7547790639e34457be6b9a921ed9c2502476990f0417122cdacf9a5f8badecee23957856f379dc3284b3fd26847058"; + sha512 = "49540e1aa588ec87c5be79cccca78801f947098f6a31ec92a1c429ea46e3dfb265fb23e90e74270350426ae563123874638924672729e74cc3a618564b41928b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/is/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/is/firefox-67.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b0c2561628b136736b17f7c52bfff315657310fce0b4445334657ebfc4e6c98e73f21da7df56e4ce4dd0a6b91ad5980eff63684a7c8109b4a00b9a24669ef625"; + sha512 = "395cb16c94e87747c947028e946b5095d008c3faca730ef9b2a8cf17d6f220caf8bd40e59e8863d49287943048c68b8246999b7838b532216b42539e36942d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/it/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/it/firefox-67.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "cdb0bf8b76a0ee92272a3b22061ff79f634bef1b2804ab40c4cdba54458b0458a77ee7dbcd17dab45015b26e8d8704f01ecd8041d8a0c1a0f2f9cd413c89d8df"; + sha512 = "0728480ebec48e6880b7eac2fc69d2401d82b8de44d6516aef8fd882fff1bf53f844986f8effae08cf8c3aa63fa469e96c733258c7b43fea530b2f34ffa71c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ja/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ja/firefox-67.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "93be68a0b11c4fc36af01d0399bc177562e5cb41fc7b7aae332bdc57c1606aea6a210c4db8154f47c6aef414be2b6ffdab4c86f0188254dfcf89ae9354f9a9fb"; + sha512 = "2931c0382e8d4398a7528c6c4f3158bf01d0f9799de8e17b1485af7435d9108a2fc0ca8a2aaa06d1be7455fc9381053293531f076ffe4318c6990f87e1659d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ka/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ka/firefox-67.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dd30a818619c26b069b3b9da38191df64ac190a5663e49d0826fda79e2ce4123f48274f66bdad64538f6d03350e462cf34961e00a0d80c67e27bdbb152e57e57"; + sha512 = "7c72e0411b8bca2f189b60ce4573281131870d0de7f7b2aa30840d6751616b947cfb697641cc447b6ac1e1c0f8d80690b589d10dfe676581a8ee873366e4710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kab/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kab/firefox-67.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "266725f1fa6050a9c2a6c7220c42e96a2605319ef7b7a93861f7a1ff05d8f28e5399a12d3091b3aacb653c13162f52cdf327b315da11226901c480cdf4836569"; + sha512 = "76a2a1a626c15fd13d9e509bcffe92f71cf9290e060e8e8d991643f4c5fcecfd3f7c28b7798000387cbfb4d21fd0cadb12672560e3d108ac18691da7f475bd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kk/firefox-67.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1dc7a5f8cb76c0fb9c537e197556de5a0996eb11701b759c2c8c0ecd89e58f60f32e75261eb70861ef6a19616bd56e29a33023c31e4b17d2ec9f91acd346f9cb"; + sha512 = "938f7744143e2fb8ed90e1ac13f3e0019a4baf399e9b7e986e95449a3f7b4be19f12345a84bb8f61fd96d09ed294f36d2d8fe5f30d3f59b9bce4a63bb191c1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/km/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/km/firefox-67.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b227eb8dfa16dd2a7686e28e7d62cef1e627b19da6879f43b435d70ff8bc9b60964b9c1427418b71c71cef6e2fd6d26a7ea67e4f9174a4dcba59d50885a6f6fa"; + sha512 = "2896499b5ee57a5e0dcedef1194f58830817515e50fe11b99c91a76b5979b93ae0a8385a8b379a4e335aa8da1ba7ffe93954d96b0ef1960b98e49f926fbbc6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kn/firefox-67.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c89b651540671c085c9b7549946004f0d0377e7fd75d6cd5156e5d4bbf2d1176a717bd062da4eb392928179ff73a87cc1f80c0f703a7f4b8424b78bbb2f29056"; + sha512 = "90e0f7a0aff8ca0132a5da8331348e87227c94c687b80a4424b47c51b3aa0afe37569189e2c4ca41d081fe3988e2bdee16ca37810c9daad429e36de1e8ede339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ko/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ko/firefox-67.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4962394b60da987c7b9945d840a98f3c4b3dc389dbfaeaf71c3194efad94f3e8646948c14383f0c6ab652f926971f1e95bf75d54e521bd13c865e61ec812f395"; + sha512 = "4b1ce01f47193cd3290af0a690a133b9a1f1661622784645d8de59553fb534bf34aee9640a909297fb5a595f4b00474d0f6e4ba73a83f12c6dfa0adb66f25f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lij/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lij/firefox-67.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "dc08d5d4e973da32b84bde101152b595270cbe610f3f970c844fc278e163ab7caaf3a4edbdfd5b7cab937ca8999eca084b0f5eda40e1a12a1334aaeb1545bc58"; + sha512 = "fea961f081745da6cd6c13caa5dfa1695f8b0627c4c33f171240c53cf4a9052f8c5c41d34525da0414d5522b07f8777d46b4aabf52c8a9021ec0bd301cb51cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lt/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lt/firefox-67.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ecb5e9977295b74c63fb64638da06322603999620bfd396405b5c272f584066b5c17e2f872c4c7c8f53fc62362b56ddf09c6f39ac496c5868339a7d270891d72"; + sha512 = "f4e73c533c8a256f1c313de5fc2117113c6702cccda64d8337c767279f5ad82c8f202935633fb790907d6b1cd6a57eb9009e7e8de64b9cb7c6604985cd0a4eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lv/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lv/firefox-67.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f668a35dd04604a07d3b93f83a7731f87d2bb726dda74a6a94bb23e2824117a0c6335a28d7bf05efe154a601472f0662aba5a2d6c38717e0ebbfa649599a7edc"; + sha512 = "6999706696ae4ee7835c4a7eedce5671a471702081236e9c1f56679a8f27c38d64847c7690e596534db738e4c666f3a2998bb1ce75f2c97b26aaf83bb45a4fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mai/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mai/firefox-67.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ac30950eb86b9583eb1dbf0ef74cbad0942ca227a7a79284cfe9beb7f1d4decad95ce8435c65c3a8120b85259cf98a1ef89ad184b1cb0afbcb69937f2aed781d"; + sha512 = "1b997a63b51677b7c31c7f1b3b5fd7e37efe132cb1cb03b394f7b9e7b3f7f44eb2184184171dd93f2d1aceef85f37da645d82bfc539fd6e2a6f763837b8eb095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mk/firefox-67.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e346090975a9c14782161142f370bc22c6c73abdb80588c9584a2efd8518fe016a764327fbae25e08ced2bb8107a50e256cdc627eceee8abb8eca3cba6993ba8"; + sha512 = "aefafd3d7f7f1cabb858a851e883ce40f3dac62ae980ad91b4d0b0323323cea1a70cb0ad845da7e56e1345ba6f3d58bd4b7ba5e10e8a45168f0fd1ffe3a1ae5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ml/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ml/firefox-67.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2d26c4af2cd67fde5e7e4132f4ab9fde8bc87340adbecd00c006b3064f67f19f7148b557faac6252b78d1446f16899b7336c87ddf9dd739c7cccb0318493a1f9"; + sha512 = "88b7907e815ea8a66ad790e83973ef20852a33d93871b0853e1f18bcd4846f49f74bd94a788edde0209b49f4988392170723c0fe14603feb1867d5845467caa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mr/firefox-67.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "536180dfa72d2e2c4043dc35e529f7243b13bee79bc3f1727752cb75165258481b16f834043843b7b3480e4a8c4a275b8242a0d4455f85b5d33a67a8e206b098"; + sha512 = "cb6286e569c2fc492a4e7faa96fa67fba89306f920cbdad85ee0f63ad5c378f9dd1d59cec06a6c09ffff4287578269c91a8d338ce9377ec41adfdbd057f7c4b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ms/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ms/firefox-67.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b2a619df14d1110910bbf96876c22c2f4d70bcc522a886d801d3ccef5b6a802ff6528e67be7a10e05d5602c397543b59e42f88cec694d721abf0d5270b4da1c3"; + sha512 = "52594f3d98d83b008e579357ae7e1653a51cdba81561371cf2168be98a4351c3c97aa8e2673e0c845680e33128d8ed22fa69ff71f5481aa1beb8000ea0f3a34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/my/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/my/firefox-67.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e45c96e33c4dd2c1707676bd2240b8c79a51bd3f5b0bb436f1d1639f62288858f6947ecd1c210b17c6000309b514ec1fcdf708824ea0c2783613eebdd9364939"; + sha512 = "3d526f91a7ae8db889cd7d9353cb63868b59d315a48324772bee6805b03fa2ec5d86bae27a8f9e30cfc2a2132abd8134ffcaaaad6354733f15dc4af2d1198c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nb-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nb-NO/firefox-67.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3f86e960b3d7eb9309b45b7c7d8110a2421f210b6890af3f5dcc8b4bd9853643d97a03c8f2d3fbb187644ea29ac39219ab17547924d98e20c4e0949e6f9acfb3"; + sha512 = "6871066e47a534bedeec7492942829fa0eab7c18c8ef920037c7fb5b862ac3519d8615205b036d93b473506143ec8f1359f92714c98b1ab1280d4b883a3fb768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ne-NP/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ne-NP/firefox-67.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "b37cbee88debed4a9fa4dd618efee71052a708cff29b398b8461f35824e6e877fc9b1df1dc856081f8e9ec820c6388a6c875965707955626b2b185a9c44f4e69"; + sha512 = "f2a1d642e3d19bb2986d0bb9f34e20e0ff6325670693c080340deddc682fefb7e78e75c3b6d311cd6cd8ca3444078e55f7186d5652fc13c2fe7bf66acfab96f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nl/firefox-67.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0e5531ee0ca2765542e84aa88b0756e0ff765e25f2f9f3db9273658f619e13c6eb1e028f2ab573d6b0b4fe3233561445136ef329c75d318aebaf9b581afc41c1"; + sha512 = "d858d833ea88aaaefe0bf08b4fa79c1a76e914add91302221d19cbfac8367409c6395df134c6c7687a425fd4f18c1b89ff041184dabff93ede8704884a0a3d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nn-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nn-NO/firefox-67.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e9aca83b6acee05063e602f5cca0dc82d04a326591f4d414ac5a3aa16ec6871dabfcf27fbb1e6bafd95fbda96e1c64251ed3eb6aa698830846b8c01e8b0f055f"; + sha512 = "723e279c90b1f122720e4b2db948e90a0fae0cc8ee2c388798fa0636a32adb08c97840e3a896a5908bf40745c3bb3fa39c56c3757d16478ed38c9afbdffa0a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/oc/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/oc/firefox-67.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "45085d11c85f6889056c144eab500a24bef9547be394e5c1834b2d7096b6c1251ec2a502e10b4b51422a6e6033a1fafb21b94330b5e370c5d8acac3aa7f609f0"; + sha512 = "5ffe99c04a170a4fa907737beecf718bf3e6519fb6edcc487af6d2af8716391a83763c16036628d02b0c0f2ebc25ae85cefc2b1b54091a43c52198b0134f19e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/or/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/or/firefox-67.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "bcb365e42dcd4d2f426117b39b39a015d3cd0b1667db653a7798fdc261ebbc52499d265b913e76330963b271d7f2fc567e2d58c5afbf6eefde87c890c6685f10"; + sha512 = "2702edfe4d419072347ef9e80b814c68837339f6bc06ae61d8c6dc283d94c77e35d57b7357544761b80903f09c73387108ffd755063e3df6035e9a8d001090a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pa-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pa-IN/firefox-67.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8f9477a044885977707288c8e2bf98858b92a61b6c4e9e98d416521913426bebf2e7d1baa0925187c0e459ec41e94d8ae7b1b26f8953b48189864f408cc573c8"; + sha512 = "27c4d23c85994691f40df9856dcf71b86a25f1364f598daa07d6cf05575ad92502d5222bfdef6501dc5676dd5e5b9d4dd9dce8f7da79cbe64b8cd1a9a949a3c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pl/firefox-67.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "86fae15a9e8ff7b7a3b7c7ad5ea7b308ed7bf5001547b0ea3a7f251f2bba4e966aeaee28d7cc489c3d9f85a4a7f3660946207d6899915834adb5a178b099a537"; + sha512 = "3bf031564ddddbac6070a141ae2a1ee1ef14376b3de73c54643c40eb71694bf03cf5b2f38c6e8bb1a0474756682d03768764b5ea92854451131725643ca4daec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-BR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-BR/firefox-67.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c54dd7d19079d41545fb305b680489e7613154c9800913405f6383e25376c96db6b80a2cf7ad0f356f78f4fd01f1f2d1d183419e78eff1e9a1ea0b0fd9955177"; + sha512 = "480c70b62a4332536c2eed8a87b3f9ac007ddebf1c88b4bd45b389869e1869a545aed29e5e17fd2ae491266b2e3cd646a3430136c12e41d13e1cdea4c40e3642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-PT/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-PT/firefox-67.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8c7ee4e79b89a523c0e0378f09f006d883a05bf0b094c3756a366cf1037e59662d9588cdfb064a00cdf22cca8e9d0b51f150b4218764ecb2c101a797a127de9c"; + sha512 = "7206ed76f715f51e2e861f57739bddf36f83508111f5b75a758237ccd4d6558997a31d0c525909c957d4878ad9168fe161308f190fd497abd29a45b8040a7be0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/rm/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/rm/firefox-67.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "73ea3ce657b4ca26eaab1239dece228643fe5bd72257f04c7273b88c2b2cf136beb76f692cbda2f799cac82688316a8fff652455d10f0dae27eace99306b7b1c"; + sha512 = "71c07e448bdb1f2b43847c51a671d652ed6442bb6d79669e662c2c01632cc949294aff63a4702284cec6665680d9b38cad23b85a6751916703d93a73b433168c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ro/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ro/firefox-67.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "12ab234921a0b7fb07737248de895a5ca32430715967a9f786d7015384d58ce68bdb555a1074cf99ed76babc61dbb73c6ab45eb0dd6d4124813d84d5db43fc4e"; + sha512 = "30ae0636594e3d03c4372f245bc5ebdbe2e0d072603bbc385dd3b725c0f8feaeff06333b38d9931c4aaaa2fb7337dbcea8368c2662fb904308caff7fd4989718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ru/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ru/firefox-67.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f5a7110b1929aae678a832de494477dbe9d89dfe8fb2a29e2d18b5a7b8c4b4fece2f8863b04e03946c318e1a3a7218ae68afc5b30f0caf39b36f8a648d4ae003"; + sha512 = "a73530f9fa02abdf7ec6e8554554bf0f4fdbbcd458a56cfadd63ab0c46af543bbfada923a9b37754c9cdf9dd0cf2b95da2e0d692a1605b18579f0ed3167a8384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/si/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/si/firefox-67.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "076c13952baa9335a26e04ddb083f76289bb541f23f4d8ee80b0c442b0b23c3fc8bfa50946c9220cc8b6d9dd6afaed1e5cbf1a9995fed26e79b7666796c7dbd9"; + sha512 = "df6dc7d452a3f5a60ffa65c73001e55218762fa40ea6f0c55f4efaeb00be3803a84d80771db60f836bd128d5aca8cef5533340cf1a731610f1f1b66d0eb8624d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sk/firefox-67.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9378267650ec97395fc9b08cc187ae5bfc16da28093202d33c64e230ffa9c7dc939474e3785df1c4f89adc3f8de2d252c3bacd754b8b904b76b5b868e5929ab1"; + sha512 = "a88cfda496b1092d9589b38849dafd11a9f96c96794130e8e9107866ff395a2e30b214bdc4ac72fb815d919cb77ccd8954bc60b6c13b2d3e1c682ade616cf357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sl/firefox-67.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5451e7f5345f5bcbf9d5d9550703f66efb316c3e4e98b5dcbd8baf68846e7ac3b2f99c53364d583dee92dcab63a2d6fdfaf0e85f39a093dc3b1dd6fec8375fd5"; + sha512 = "2807f4bdb8d714caa05c72982f773fed0ab25646e99fea44360f60c07149582fb9933a9668ae4012e6b1ec230e2cd4bae57f81f925b77d728f8d6a248746608b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/son/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/son/firefox-67.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e552d6884ad981eff2badd8584d79a7b7f561e88cd1bb65f86dc08f162d174b2a05d800255c3e1a3d65c11bd5c54a54177f3c990b954b2d439a70b6f8a15e81e"; + sha512 = "ca5465d62e66146440d56bd2d65b7e770bc4fb089fa593860a3950371e581ed15c35557d2f0a7dfdac323f35b8550f11b80656637176db66a3dd310d881f7169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sq/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sq/firefox-67.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7c5d678e248102949298dc8aae4c3d174b01814e176dc923bcb23e71a49b96f16c167cc736e222a83a7c11de34708308b7d5f6057df71599a51fb353984c5223"; + sha512 = "ece96854ddd377c2e070f499210990aa07b2bee5f9c36dfa5e4c66ee1536a3462b921643ec7adc5fc72dd3d2f5eee9996b37120c19ef736e92f303cd816f0d59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sr/firefox-67.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "07718754558e1023f437fba61dd55b9610dd2f0f3ec15d7c36b56433d162e2699f93b094e50794d15fba74b2c02eada99fdb283de70c73394041180b8e7d7345"; + sha512 = "fa8ddee8dbadaeedcd725fe031deea24cd835002fe93a9961598a00f09f7fb14355d6a26d049819c00c4a95f2bf149a598e31f7b86ec5b3b26b7c3aa47cadda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sv-SE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sv-SE/firefox-67.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2d8bff74fb6537eae2c8e34df58a9233c4df3572cb3d7bb8b68660e4fd6848e23e58709ec4e7ec049c8e43aa40394b6f4b2f89363d91e6879c25ff0c523c27e"; + sha512 = "eef44d9f7812718273eeb0b111fd19c97872854a1a257060ed2f7b9fa6a152a17c123e6f86edc6d0474836a3e78ba5d939c486b7d0f851d3a344d217d5aa7e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ta/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ta/firefox-67.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0fd4b8c94340d341ef2fe70c10b4880a1073972b1b3df3391f92b6084e2cb84ccf9dbf764e26b04007b286106289b94806f6387c353a68ae64bacd4b2ca8eb50"; + sha512 = "54c7c7675945ea2915c5854da6a3f693dc52ba302c25b093d66f95121eb126c1650d2cb040c6b47b3b9562a17906f1e78d38b70b6b045b6f9c2a439a97577a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/te/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/te/firefox-67.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3d1f9f8abe7b0491c0ce6084f6e4bd047fd606de376afe9d811f2ba91593f3e98e3d2f26d27c550c008455e76237a98c4f0847e88c3ed338ce1d495a3380ebbb"; + sha512 = "0cd84eba0aec8be3a4b553a22642a93f5eb662668a11bbe7e5ebba4fb5561149cedd05c110a2da79e0ca040b12c7f96c6a839c7afdaf0ccfc8ee42082e3217d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/th/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/th/firefox-67.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9f1343de6e161ec1803d56e7a87e1d3fa8b05c16fdb101f19daa8f514456e70645ff0935cbd7ce4a3d3d760b4b1107d28bf0f463509aaf197d7a91adb31c88a2"; + sha512 = "ff19b5487a4757c1c45057a3362abe92e4c9843e44ce497176de018d2e62cf9dd86bf049e94db940683ab0237d8425de2dae7d035de14ab469b74c325c5e2422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/tr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/tr/firefox-67.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "21058f2b49cca57e6146a02e211a0d80a92e3e2bd46445b06a8b5399ec1c2965d7e17d58f7c256ade21ff9399bc7dae1c8eb09555dee84d0e92a37f05e7b3353"; + sha512 = "684bbfeef4c1f1798ae65969d61feda683eff650744df4ab67d20c733f48be4a3593c5dab31a47373f42d205dfa5ddc99ec76bfb983a54c3888fbf48a334d0a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uk/firefox-67.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9d85bfa038ea5ebdda4061fa99e85ac93585f6d781e6a7b9297c189b6bc1e593bf429c2d1cc9344ccc253aef2367aeb840caa20ebf65af067636555fe8c66f57"; + sha512 = "452cd4466c8be5bd38918582b3a979dd97c7268ca475d77954138adbf4538a731c60001cfea93b20292ec144639fedd52d5d12949d6a7a9c392334792d659ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ur/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ur/firefox-67.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "06a3f2d441756c1506e8307ef8f42257eb37f63eca1378427c59880e9db3de44d85bc39241f1e43970c04dac00c4c4f6b82d7203c48b5b0c113fd1589e8e8639"; + sha512 = "b4f05f87a341477ae8e54a7fda46175f9dcf52f92daf6f278aa3cdc81697e4fdb1ea5dc850c547dfca082360362e8a38a8b0c0b4505c55a5added2df500c7f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uz/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uz/firefox-67.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0c6ded8776bcac49035f7fbc73c4a8c5470a081d79b883040ae7b9f60e31ece2c4a2f0baf867b6fdd722b0cbc3f359d1f9aaf75a364edb03b8f01e9946f109ee"; + sha512 = "9eb28b63a6172c6d3edd70f61821dc7af91f3696969e45891dfac7c83f0293d5969f99dec3b49a8b00f628b4d17bc907f38c4f7750af860a6d81629823ae47d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/vi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/vi/firefox-67.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6091c0e48a097408cc2251f0bebce6e77ced9771486c67fc89074490455ca11048b2653d0b934b23c8266730af3fd58fef96a3319af8cbd8c6c83b740fd87bb4"; + sha512 = "c809f7350da95034ee3e94140c5e987dba1ebc8693f60d9c7454e43ac320d44c991ac6ea4f431d695b0e5f382101f5d34b435cb2021dc926378a22fd4407c0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xh/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xh/firefox-67.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "18bf62d055408eefccf145cf42d95234d88646b82c2f9d6f8f5107409be23879dac63b1ba0346d8295b114145c95921848de73aa98aee6343deb3bd103f73e46"; + sha512 = "6fdcd3aec5a051505c907b5f5cf35a9407bf7239d23d26fdc9e28b754c93cf7e3bcc25077e6c8033497638ca1dfc0141e4fe9d034dbd4540b479e06e5fa3e5ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-CN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-CN/firefox-67.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e999b37838b09da9f5315ec692543c59a1a801c99560f8830ce1998cbcc6fce92a873a8b628682b176dac580a6f66e89588e2a2cbe7214cea542bf0c7162171b"; + sha512 = "c1bbb8a94b342f10f0b238a507e0f79172907fc92c5e7674b40158e302329e1f69317bfedf135e90a077bec49ad1328b93cc832de09231152154536e534031c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-TW/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-TW/firefox-67.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a66bdf11578fddc740a9dcd4d1bb43c29d27c6c4cd26e896a88050c6bec4a0d5cd9ffc6ab3e48b2ae202b7de9bf11b402436a37001b1d166b7a6a1296e57a998"; + sha512 = "10c1b7062a0f3d3ab929f73b1302edfe525470e6b2cc6fcf81e6da00a96ad561c90a61ea24bba006b1ea15310c8dc85422b4af48736f5402dc4531976647fd7d"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c0cfcf412c5ec..6e39904d27ba3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,7 +94,7 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] + ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 61df0c61fab3c..60d677f96064b 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 = "66.0.5"; + ffversion = "67.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "18bcpbwzhc2fi6cqhxhh6jiw5akhzr7qqs6s8irjbvh7q8f3z2n046vrlvpblhbkc2kv1n0s14n49yzv432adqwa9qi8d57jnxyfqkf"; + sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051"; }; patches = [ @@ -72,10 +72,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.6.3esr"; + ffversion = "60.7.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3zg75djd7mbr9alhkp7zqrky7g41apyf6ka0acv500dmpnhvn5v5i0wy9ks8v6vh7kcgw7bngf6msb7vbbps6whwdcqv3v4dqbg6yr2"; + sha512 = "1armp7nmzn864l42nasw0zqsp8y1zj4vhgbm99c49a435m44c8p66qrjxy6rn2haqsy76i9x5zf8ph2d014ap6g5yhidj7iymbjh5f2"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 90df5c40395a5..61484478e4de9 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -127,6 +127,7 @@ let --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ + --set SNAP_NAME "firefox" \ ${lib.optionalString gdkWayland '' --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 177b3c6e925a2..88fbcb76774bb 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.9"; + version = "8.5"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc"; + sha256 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv"; + sha256 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 39351512a6a80..1c1c9fd5bfff6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.43-1"; + version = "2.5.1525.46-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0mmyl32fz6p43gz8vzkhh0z1wcb3l5cckxl8vkz53lb9k2mckjqi"; + sha256 = "0hxmpd4j1cq4643x17syzqxfxki6jngvf28jd71pp58hngffh3g4"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 73ec998ed8e81..6116a9b66da26 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.40.1"; in +let version = "0.64.1"; in buildGoPackage { name = "helmfile-${version}"; @@ -9,9 +9,11 @@ buildGoPackage { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv"; + sha256 = "1258c545fv4mcrzaw3z5gxl264fcahigaijgkjd4igh4pl0z0wxk"; }; + goDeps = ./deps.nix; + goPackagePath = "github.com/roboll/helmfile"; nativeBuildInputs = [ makeWrapper ]; @@ -26,12 +28,11 @@ buildGoPackage { --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} ''; - meta = { description = "Deploy Kubernetes Helm charts"; homepage = https://github.com/roboll/helmfile; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pneumaticat ]; + maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/deps.nix b/pkgs/applications/networking/cluster/helmfile/deps.nix new file mode 100644 index 0000000000000..77b19aef2504a --- /dev/null +++ b/pkgs/applications/networking/cluster/helmfile/deps.nix @@ -0,0 +1,165 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.4.1"; + sha256 = "1sr9nxvasy2mw00al3i7yp3wdz2q21wp3l1n1nydvmyf27ibg3bj"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.15.0"; + sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "v1.0.1"; + sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.0.0"; + sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.6"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/tatsushid/go-prettytable"; + fetch = { + type = "git"; + url = "https://github.com/tatsushid/go-prettytable"; + rev = "ed2d14c29939"; + sha256 = "01l2v8vfv9ng0g9p0ys5szkqpc0f9baglkavn7yxkif05kdqi0ik"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "6011f165dc28"; + sha256 = "159q8lwf40jaxbm7cybzsws176k0wsdcaaj2rx0wdw4m6xha8034"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "v1.1.0"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "v1.8.0"; + sha256 = "0i9pfm5br4qq94ys1y5sr8h31bbq1xwcaxibx7g2n5n1bcbqviam"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "b2aa35443fbc"; + sha256 = "05qaicps075s77020q1vjihi5k7jbgr85ry0br9lj3jynwnrgyyg"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 6401194eac203..3572bfe7f5ba0 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -7,7 +7,7 @@ let sha256 = { "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf"; - "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; + "2.4.3" = "1dvvr1q3dz961bl7qigxngrp4ssrbll3g1s6nkra6gyr83pis96c"; }.${version}; in diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3c4e58098c761..1cdfa8570a1e6 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.13"; - sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna"; + version = "0.11.14"; + sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0-rc1"; - sha256 = "1ap1q5bixkzshnwy8xyfh768qwg3y4pcjzaiajzn2icjf4ay5nqm"; + version = "0.12.0"; + sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index cda455d9e56e8..6ef4465cd92c3 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage, stdenv }: let - stableVersion = "2.1.16"; - previewVersion = "2.2.0a5"; + stableVersion = "2.1.18"; + previewVersion = "2.2.0b1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; - serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; + guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i"; + serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0p4g5hszys68ijzsi2rb89j1rpg04wlqlzzrl92npvqqf2i0jdf8"; + sha256Hash = "0kx68r8kgnsb7710a1a5y64blmw2jl1gv37bzbbivi15dzgmykfh"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1yvdfczi8ah9m7b49l7larfs678hh7c424i1f73kivfds6211bj5"; + sha256Hash = "1jxkba7hc7271hjw3839r0yfzs87dzv1nqx62adhk9qrrcfqhg58"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 556d341231f6f..dcad3027e96b4 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -47,6 +47,8 @@ in python.pkgs.buildPythonPackage { postPatch = '' # "typing" is only required for Python 3.4 and breaks Python 3.7: sed -iE "s/.*typing.*//" requirements.txt + # Only 2.x is problematic: + sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45d0dadbe902f..b477a194faf18 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.8.183302.0415"; + version = "2.8.222599.0519"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x"; + sha256 = "0bmrqxz41pxcz41dcdbwd2b0hjv8fvix09jwxrnca4d50jq9fx7j"; }; }; diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 81073222c2b4e..bd05b63c68bb6 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -6,7 +6,8 @@ weechat: let wrapper = { - configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + installManPages ? true + , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } }: let @@ -65,14 +66,22 @@ let ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} '') // { - inherit (weechat) name; + inherit (weechat) name man; unwrapped = weechat; + outputs = [ "out" "man" ]; }; in buildEnv { name = "weechat-bin-env-${weechat.version}"; + extraOutputsToInstall = lib.optionals installManPages [ "man" ]; paths = [ (mkWeechat "weechat") (mkWeechat "weechat-headless") + (runCommand "weechat-out-except-bin" { } '' + mkdir $out + ln -sf ${weechat}/include $out/include + ln -sf ${weechat}/lib $out/lib + ln -sf ${weechat}/share $out/share + '') ]; meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ]; }; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 79deab46912bc..bc0918737dd52 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -10,7 +10,7 @@ let alternativeConfig = builtins.toFile "lumail2.lua" (builtins.readFile alternativeGlobalConfigFilePath); - globalConfig = if isNull alternativeGlobalConfigFilePath then '' + globalConfig = if alternativeGlobalConfigFilePath == null then '' mkdir -p $out/etc/lumail2 cp global.config.lua $out/etc/lumail2.lua for n in ./lib/*.lua; do diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index a3d55d7dff721..ed29a34f99c8f 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdc-${version}"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"; + sha256 = "0n9sn4rh4zhmzjknsvyp4bfh925abz93ln43gl8a1v63rs2yyhgx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 95f8ebea07871..96140d14803b1 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.4"; + name = "homebank-5.2.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1lhj4pnszw4a1r8ls8lwqyakg5bmldziaxgydbx76nbah6w9ma3r"; + sha256 = "1716igj18792sp4rx0vwxvx95mahgb7wiyahd2018yq8z88vc36w"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index f71f4eaa40859..9f2ea82cee052 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 20dd27fa28737..ad0d5c636f369 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,17 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "timetrap-${version}"; - - version = (import gemset).timetrap.version; - inherit ruby; +bundlerApp { + pname = "timetrap"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; - license = licenses.mit; - maintainers = [ maintainers.jerith666 ]; + homepage = https://github.com/samg/timetrap; + license = licenses.mit; + maintainers = with maintainers; [ jerith666 manveru ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 5764016573fcc..1ea489b92c3fa 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -8,6 +10,8 @@ version = "0.10.2"; }; sequel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; @@ -16,6 +20,8 @@ version = "4.43.0"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; @@ -25,6 +31,8 @@ }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index ef9b28b36f82a..3ff73c4ef2ab1 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "19.01.0"; + version = "19.04.0"; in stdenv.mkDerivation { name = "limesuite-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "1r03kc1pvlhkvp19qbw7f5qzxx48z2v638f0xpawf6d1nwfky1n3"; + sha256 = "1lrjrli0ny25qwg8bw1bvbdb18hf7ffqj4ziibkgzscv3w5v0s45"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix new file mode 100644 index 0000000000000..3464e134ee853 --- /dev/null +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, argtable }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + name = "clustal-omega-${version}"; + + src = fetchurl { + url = "http://www.clustal.org/omega/${name}.tar.gz"; + sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6"; + }; + + buildInputs = [ argtable ]; + + preConfigure = '' + for f in configure \ + src/clustal-omega-config.h \ + src/clustal-omega-config.h \ + src/config.h.in \ + src/mymain.c + do + sed -i -re 's/argtable2/argtable3/g' $f + done + ''; + + meta = with stdenv.lib; { + description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; + homepage = http://www.clustal.org/omega/; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 01b1c0ba81bfb..d188ca02b1833 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.3e"; + version = "2.4"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "046gmq8nzqy5v70ydqrhib2aiyrlja3cljvd37w4qbd4ryj3jr0w"; + sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 35d21848e2b3f..274afd5fc3d82 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.9.5"; + version = "6.1"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9"; + sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 774fbadd4fd31..7427875895f35 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -29,10 +29,7 @@ let "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; }."${version}"; - coq-version = - let inherit (builtins) concatStringsSep head map; in - let inherit (stdenv.lib) take splitString; in - concatStringsSep "." (take 2 (map head (map (splitString "pl") (splitString "." version)))); + coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index dae5e1b76d35b..dc0e9ea1aa5d7 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "128"; src = - if builtins.isNull releasePath then + if releasePath == null then throw '' This nix expression requires that the cplex installer is already downloaded to your machine. Get it from IBM: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 18060f342a92a..5bb7eda47d5d3 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -59,7 +59,7 @@ let # return the names of all dependencies in the transitive closure transitiveClosure = dep: - if isNull dep then + if dep == null then # propagatedBuildInputs might contain null # (although that might be considered a programming error in the derivation) [] diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index ff25bc9749007..2633f4c8db1ba 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -2,11 +2,12 @@ with stdenv.lib; stdenv.mkDerivation { - name = "aliza"; + pname = "aliza"; + version = "1.48.10"; src = fetchurl { - # Hosted on muoniurn's google drive - url = "https://drive.google.com/uc?export=download&id=1zMYfSUqMaYuvuF41zAFUC5ndR55wD7Ip"; - sha256 = "0prlmzz8qbqqkr0plk781afq25dvy4pv89vlgccpim79psqlchl3"; + # See https://www.aliza-dicom-viewer.com/download + url = "https://drive.google.com/uc?export=download&id=16WEScARaSrzJpJkyGuOUxDF95eUwGyET"; + sha256 = "1ls16cwd0fmb5axxmy9lgf8cqrf7g7swm26f0gr2vqp4z9bw6qn3"; name = "aliza.rpm"; }; @@ -48,5 +49,6 @@ stdenv.mkDerivation { homepage = http://www.aliza-dicom-viewer.com; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 35e9c17438f7b..cea588f76ca29 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { name = "transcrypt-${version}"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ git makeWrapper openssl ]; + buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; + + patches = [ ./helper-scripts_depspathprefix.patch ]; installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt @@ -20,7 +22,13 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" + + cat > $out/bin/transcrypt-depspathprefix << EOF + #!${stdenv.shell} + echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + EOF + chmod +x $out/bin/transcrypt-depspathprefix ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch new file mode 100644 index 0000000000000..925aadab3dd59 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch @@ -0,0 +1,37 @@ +diff --git a/transcrypt b/transcrypt +index a0b562d..7888f5d 100755 +--- a/transcrypt ++++ b/transcrypt +@@ -278,6 +278,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/clean" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -300,6 +301,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/smudge" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + tempfile=$(mktemp 2> /dev/null || mktemp -t tmp) + trap 'rm -f "$tempfile"' EXIT + cipher=$(git config --get --local transcrypt.cipher) +@@ -309,6 +311,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/textconv" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -351,7 +354,7 @@ save_configuration() { + git config merge.renormalize 'true' + + # add a git alias for listing encrypted files +- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" ++ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" + } + + # display the current configuration settings diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 67c07072d41f8..92ba57382501c 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.5.2"; + version = "2.7.2"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck"; + sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc"; }; preBuild = '' diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b97123926eb51..180664d338636 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }: +{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "pijul-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5"; + sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig clang ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} @@ -20,12 +18,14 @@ buildRustPackage rec { $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish ''; - buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Security ]); + LIBCLANG_PATH = libclang + "/lib"; + + buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); doCheck = false; - cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz"; + cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 48c5032f2da2c..4802d259fb23e 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: +, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; @@ -15,8 +15,18 @@ in buildPythonApplication rec { sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; }; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext wrapGAppsHook + + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 91fd7eab1268d..b9976e5401968 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -59,7 +59,7 @@ let self = rec { extraRuntimeDependencies = [ ]; installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + ${if sourceDir == null then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index aba3b81fde85d..f0c3776a43361 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { - name = "qarte-3.10.0+188"; + name = "qarte-4.6.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; - rev = "188"; - sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9"; + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; + rev = "22"; + sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix new file mode 100644 index 0000000000000..6e2790ef8590b --- /dev/null +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -0,0 +1,75 @@ +{ flavor ? "" +, ldflags ? "" +, stdenv +, btrfs-progs +, buildGoPackage +, fetchFromGitHub +, glibc +, gpgme +, libapparmor +, libassuan +, libgpgerror +, libseccomp +, libselinux +, lvm2 +, pkgconfig +}: + +buildGoPackage rec { + project = "cri-o"; + version = "1.14.1"; + name = "${project}-${version}${flavor}"; + + goPackagePath = "github.com/${project}/${project}"; + + src = fetchFromGitHub { + owner = "cri-o"; + repo = "cri-o"; + rev = "v${version}"; + sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk"; + }; + + outputs = [ "bin" "out" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror + libseccomp libselinux lvm2 ] + ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + + makeFlags = ''BUILDTAGS="apparmor seccomp selinux + containers_image_ostree_stub"''; + + buildPhase = '' + pushd go/src/${goPackagePath} + + # Build conmon and pause + go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \ + -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config + + pushd conmon + ../bin/crio-config + popd + + make -C conmon + make -C pause + + # Build the crio binary + go build -tags ${makeFlags} -o bin/crio -buildmode=pie \ + -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio + ''; + installPhase = '' + install -Dm755 bin/crio $bin/bin/crio${flavor} + + mkdir -p $bin/libexec/crio + install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor} + install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} + ''; + + meta = with stdenv.lib; { + homepage = https://cri-o.io; + description = ''Open Container Initiative-based implementation of the + Kubernetes Container Runtime Interface''; + license = licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 719626fe40a8d..d2e42740d0fc2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -201,9 +201,9 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.5"; - rev = "e8ff056dbcfadaeca12a5f508b0cec281126c01d"; - sha256 = "16nd9vg2286m6v47fjq2zicmfvi8vwiwn24yylxia8b9mk417kdb"; + version = "18.09.6"; + rev = "481bc7715621adba10752357e0d537c8dc86507d"; + sha256 = "15l77g7f7zhn33b0a5k56nk2722yl0nm1fl6cmlgcv4ih7q7cl6c"; runcRev = "2b18fe1d885ee5083ef9f0838fee39b62d653e30"; runcSha256 = "0g0d9mh5fcvsjgddiyw98ph5zpz5ivlwy89m45jxwbzkxb21gy7w"; containerdRev = "bb71b10fd8f58240ca47fbb579b9d1028eea7c84"; diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix index 7ddfc2ebab06d..a8e15d075b301 100644 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ b/pkgs/applications/virtualization/podman/conmon.nix @@ -1,23 +1,21 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib }: with lib; +with builtins; stdenv.mkDerivation rec { name = "conmon-${version}"; - version = "unstable-2019-03-19"; - rev = "84c860029893e2e2dd71d62231f009c9dcd3c0b4"; + version = "0.0.1pre52_${substring 0 7 src.rev}"; src = fetchFromGitHub { - owner = "containers"; - repo = "conmon"; - sha256 = "1ydidl3s7s5rfwk9gx0k80nxcixlilxw61g7x0vqsdy3mkylysv5"; - inherit rev; + owner = "containers"; + repo = "conmon"; + rev = "6905a4dc47830fbd1110e937228057c0b073ebe1"; + sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glib - ]; + buildInputs = [ glib ]; installPhase = '' install -D -m 555 bin/conmon $out/bin/conmon diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 6321be0f07097..4ea831168d84b 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig -, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp +, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd , go-md2man }: buildGoPackage rec { name = "podman-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { - owner = "containers"; - repo = "libpod"; - rev = "v${version}"; - sha256 = "1nlll4q62w3i897wraj18pdi5cc91b8gmp360pzyqzzjdm9ag7v6"; + owner = "containers"; + repo = "libpod"; + rev = "v${version}"; + sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x"; }; goPackagePath = "github.com/containers/libpod"; @@ -22,9 +22,7 @@ buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man ]; - buildInputs = [ - btrfs-progs libseccomp gpgme lvm2 - ]; + buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' pushd $NIX_BUILD_TOP/go/src/${goPackagePath} diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/build-support/add-opengl-runpath/default.nix new file mode 100644 index 0000000000000..5cab0937e0747 --- /dev/null +++ b/pkgs/build-support/add-opengl-runpath/default.nix @@ -0,0 +1,12 @@ +{ lib, stdenv }: + +stdenv.mkDerivation { + name = "add-opengl-runpath"; + + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; + + buildCommand = '' + mkdir -p $out/nix-support + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; +} diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh new file mode 100644 index 0000000000000..e556e7ead2a78 --- /dev/null +++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh @@ -0,0 +1,29 @@ +# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. +# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid +# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run +# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf +# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary +# it set on (including for dlopen), so the RUNPATH must indeed be set on these +# libraries and would not work if set only on executables. +addOpenGLRunpath() { + local forceRpath= + + while [ $# -gt 0 ]; do + case "$1" in + --) shift; break;; + --force-rpath) shift; forceRpath=1;; + --*) + echo "addOpenGLRunpath: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1;; + *) break;; + esac + done + + for file in "$@"; do + if ! isELF "$file"; then continue; fi + local origRpath="$(patchelf --print-rpath "$file")" + patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file" + done +} + diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 96e61bbf90e5c..e2ec84c75e66b 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ ename = - if isNull(ename) + if ename == null then pname else ename; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 3459713550018..d90fa99dd7026 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp -R * $out/share/man ''; - meta = { - description = "C++ STD manual pages"; - homepage = https://gcc.gnu.org/; - license = "GPL/LGPL"; - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + description = "GCC C++ STD manual pages"; + homepage = "https://gcc.gnu.org/"; + license = with licenses; [ fdl12Plus ]; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix new file mode 100644 index 0000000000000..965bf119f6e70 --- /dev/null +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl }: + +let + version = "0.0.4.7"; +in fetchurl { + name = "cnstrokeorder-${version}"; + + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + + recursiveHash = true; + downloadToTemp = true; + + postFetch = '' + install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + ''; + + sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; + + meta = with lib; { + description = "Chinese font that shows stroke order for HSK 1-4"; + homepage = "http://rtega.be/chmn/index.php?subpage=68"; + license = [ licenses.arphicpl ]; + maintainers = with maintainers; [ johnazoidberg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 4def0b44b143c..cc219b74179d4 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,23 +1,30 @@ { lib, fetchzip }: let - version = "20141012"; + version = "20170904"; in fetchzip { name = "hanazono-${version}"; - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; + url = "mirror://sourceforgejp/hanazono-font/68253/hanazono-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; - sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; meta = with lib; { - description = "Free kanji font containing 96,327 characters"; - homepage = http://fonts.jp/hanazono/; + description = "Japanese Mincho-typeface TrueType font"; + homepage = "https://fonts.jp/hanazono/"; + longDescription = '' + Hanazono Mincho typeface is a Japanese TrueType font that developed with a + support of Grant-in-Aid for Publication of Scientific Research Results + from Japan Society for the Promotion of Science and the International + Research Institute for Zen Buddhism (IRIZ), Hanazono University. also with + volunteers who work together on glyphwiki.org. + ''; # Dual-licensed under OFL and the following: # This font is a free software. diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix new file mode 100644 index 0000000000000..1c1609b03f193 --- /dev/null +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip }: + +let + version = "4.002"; +in fetchzip { + name = "kanji-stroke-order-font-${version}"; + + url = "https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${version}.zip?attredirects=0"; + + postFetch = '' + mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/kanji-stroke-order + unzip -j $downloadedFile \*.txt -d $out/share/doc/kanji-stroke-order + ''; + + sha256 = "194ylkx5p7r1461wnnd3hisv5dz1xl07fyxmg8gv47zcwvdmwkc0"; + + meta = with stdenv.lib; { + description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; + homepage = "https://sites.google.com/site/nihilistorguk/"; + + license = [ licenses.bsd3 ]; + maintainers = with maintainers; [ ptrhlm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix new file mode 100644 index 0000000000000..c05b9c69aef56 --- /dev/null +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip }: + +let version = "2.2.0"; in +fetchzip rec { + name = "redhat-official-${version}"; + url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; + + meta = with lib; { + homepage = https://github.com/RedHatOfficial/RedHatFont; + description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d1652be90d6b4..78f660ae44317 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz"; - sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/85d71d5231521c70b961570dbbee953253fb379b.tar.gz"; + sha256 = "1mdp2ivnx7wvd63bq1li9gpsm5sv1s167crv1jjlqw578lbi8hv7"; } diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 7c3c852e6afda..1fc82e8aca2b6 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2019-01-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg"; + rev = "f6167740b308715b38567ec660aa5241d964af1b"; + sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index b43a6e35ab253..3b80c60044bd5 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -8,23 +8,26 @@ , xfceSupport ? true , gtkNextSupport ? false , plankSupport ? false +, steamSupport ? false , telegramSupport ? false -, tweetdeckSupport ? false +, tweetdeckSupport ? false, zip ? null , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) , suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500) , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: +assert tweetdeckSupport -> zip != null; + stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1jllsl2h3zdvlp3k2dy3h4jyccrzzymwbqz43jhnm6mxxabxzijg"; + sha256 = "10xvfrc945zqlgzlx8zjyg0gnkwmq9vfjk0yqjy3gg62i65s8sch"; }; preferLocalBuild = true; @@ -37,7 +40,8 @@ stdenv.mkDerivation rec { inkscape libxml2 gnome2.glib.dev - ]; + ] + ++ stdenv.lib.optional tweetdeckSupport zip; buildInputs = [ gdk_pixbuf @@ -62,6 +66,7 @@ stdenv.mkDerivation rec { (enableFeature xfceSupport "xfce") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") + (enableFeature steamSupport "airforsteam") (enableFeature telegramSupport "telegram") (enableFeature tweetdeckSupport "tweetdeck") ] @@ -70,6 +75,13 @@ stdenv.mkDerivation rec { ++ (withOptional suggestionColor "suggestion_color") ++ (withOptional destructionColor "destruction_color"); + postInstall = '' + for dest in $out/share/gtksourceview-{3.0,4}/styles; do + mkdir -p $dest + cp $out/share/themes/Plata-{Noir,Lumine}/gtksourceview/*.xml $dest + done + ''; + meta = with stdenv.lib; { description = "A Gtk+ theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix new file mode 100644 index 0000000000000..48f29ad311130 --- /dev/null +++ b/pkgs/data/themes/stilo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "stilo-themes"; + version = "3.32-3"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcndr5mfa91f0ln0az3m79pidjy882v65w5fi5w05kykrmvv81z"; + }; + + nativeBuildInputs = [ meson ninja sassc ]; + + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + meta = with stdenv.lib; { + description = "Minimalistic GTK themes"; + homepage = https://github.com/lassekongo83/stilo-themes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 2e74e2819e38e..f55ed31c1cefa 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.32-1"; + version = "3.32-4"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0x6ghc7n5y7p0agm2yp7rygz9154f58s891zxzhd07wc2c4mzp0s"; + sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h"; }; - buildInputs = [ gdk_pixbuf librsvg ]; + nativeBuildInputs = [ meson ninja sassc ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; - installPhase = '' - install -dm 755 $out/share/themes - cp -a Zuki* $out/share/themes/ - ''; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; meta = with stdenv.lib; { description = "Themes for GTK3, gnome-shell and more"; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index efff8f846b946..f7d22220e6443 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection -, itstool, libxml2, python3Packages, at-spi2-core -, dbus, gettext, libwnck3 }: +{ stdenv +, fetchurl +, pkgconfig +, gnome3 +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, itstool +, libxml2 +, python3 +, at-spi2-core +, dbus +, gettext +, libwnck3 +, adwaita-icon-theme +}: -stdenv.mkDerivation rec { + python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.32.1"; + version = "3.32.2"; + + format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4"; + sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook itstool gettext + gettext gobject-introspection # For setup hook + itstool + libxml2 + pkgconfig + dbus + wrapGAppsHook ]; + buildInputs = [ - gtk3 libxml2 python3Packages.python python3Packages.pyatspi - python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme + adwaita-icon-theme + at-spi2-core + gtk3 + libwnck3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ipython + pyatspi + pycairo + pygobject3 + xlib ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + # Strict deps breaks accerciser + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a423dd85887c9..83202a75c2644 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq"; + sha256 = "1sb60zhdawza33zlp0n3hbd7mq43a4y09jmkphpnxdifypfkar55"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index f767e309a65a3..532e8dcb0f086 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; + sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index a983c59d192e7..3b68bec7585ec 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.32.0.2"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk"; + sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 3244fa639c2fc..03619f38c9ba8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wip968nvp1yj34hbpc3wjbrmrgjm1f82ag5ngv90z38953vi9vl"; + sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b3b9fb0dddd6a..a059ec3ac3ce2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0"; + sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 4e601849a35f9..1f1bfafb5950f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.32.1"; + version = "3.32.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4"; + sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index cf056ca784132..73b8016d97b48 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0z2dxj1hd798jn79y9a7lkb77lm8l7y5fsqh9g6lbr7pnmg559yk"; + sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index b3feb230d0f40..a1bcb406eb3a0 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nh2gahiixj661a3l008yhidx952q50fqgdckg8l0d237wnwp7f6"; + sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 1a9516430d9ae..43f8dd08dbffe 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 7fd092c1efa44..5c896ec01fc0b 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "165axw63c2l5qk5k2xs7g9d97xnxf5a4br0hdb8s3bpv7lf5nw8q"; + sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 25c3cef3f6a42..ef4de36991514 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.56.1"; + version = "1.56.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937"; + sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 33095a0f1b984..d9001d9b1b940 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pb00af3w4wivdhcvdy59z2xlxasg90bcm5a9ck0p5lf97adwx08"; + sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; LANG = "en_US.UTF-8"; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index f71df437d1130..ab4b360221e57 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0xxhvyqfwlcyvlqc36rpcili00dpwy8b5c5klaqccn5qrc87rl38"; + sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 9b25ae9218d42..77a630261fb50 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x"; + sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 02bcb52b3875f..d9f9386214332 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw"; + sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 9be383220e6ea..8aa7cff2d0302 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.28.3"; + version = "3.28.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28 - sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v"; + rev = version; + sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 2c305f002fd5d..a8bc4e7701106 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q74lrb08vy0ynxbssqyxvbzf9252xgf9l6jxr9g4q0gmvpq402j"; + sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 688e8cc93657c..2eeb77db0c651 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -7,13 +7,13 @@ let pname = "nautilus"; - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2"; + sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ad2ac5d6e690b..047e79e14e5cf 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.32.2"; + version = "3.32.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k"; + sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 41120a74b0848..d6ed0c22e4b7d 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz"; + sha256 = "1qrn8ss3wc601w8j0ziicgmgic0yh01az6611n3jgd7wll9c79wr"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index ecbb7b277ff3e..24a49413960ca 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r"; + sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 9ceb65f830833..b2c8e99e82393 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj"; + sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; # gobject-introspection for finding vapi files diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index de0d70ae42f43..7bb162b7b8b4c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -26,13 +26,13 @@ let pname = "gnome-applets"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cvl32486kqw301wy40l1a1sdhanra7bx4smq0a3lmnl3x01zg43"; + sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { doCheck = true; configureFlags = [ - "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets" + "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets" ]; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index f9387c11b819c..6d8f48f0d8e64 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -1,7 +1,6 @@ { stdenv , autoreconfHook , fetchurl -, fetchpatch , gettext , glib , gnome-bluetooth @@ -29,25 +28,16 @@ let pname = "gnome-flashback"; - version = "3.30.0"; + version = "3.32.0"; requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57"; + sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62"; }; - patches =[ - # overrides do not respect gsettingsschemasdir - # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch; - sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh"; - }) - ]; - # make .desktop Execs absolute postPatch = '' patch -p0 <<END_PATCH diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index db00758fb55fe..3031b2c1d78f1 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , autoreconfHook -, fetchpatch , dconf , evolution-data-server , gdm @@ -24,7 +23,7 @@ let pname = "gnome-panel"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -32,18 +31,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12q0l7wy6hzl46i7xpvv82ka3bn14z0jg6fhv5xhnk7j9mkbmgqw"; + sha256 = "0a9zi1jb0b42zd6wx3251cnns9v1w0cbwasmrx9hsj1dsb9pjq3a"; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/GNOME/gnome-panel/issues/8 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/77be9c3507bd1b5d70d97649b85ec9f47f6c359c.patch; - sha256 = "00b1ihnc6hp2g6x1v1njbc6mhsk44izl2wigviibmka2znfk03nv"; - }) - ]; - # make .desktop Exec absolute postPatch = '' patch -p0 <<END_PATCH diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index c42356aa16aa6..8b1d2b05df11c 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -16,13 +16,13 @@ let pname = "metacity"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kr472gblx7jxh9rvnamy09bkg29ms2pgc0c3373piqmavi24qg"; + sha256 = "177dmb1smizfgkddk49n2kr90graj9r6xw5hg3aq0y2qqg6v4rcg"; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 8db8eb5d5e0e2..571dab02c3181 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44"; + sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9"; }; passthru = { diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index cd2fa293e7d0e..034b57ec06a3d 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index cfafc4d13219b..ac0a3494c226e 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz"; - sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0"; - name = "bluedevil-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz"; + sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f"; + name = "bluedevil-5.15.5.tar.xz"; }; }; breeze = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz"; - sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b"; - name = "breeze-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz"; + sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4"; + name = "breeze-5.15.5.tar.xz"; }; }; breeze-grub = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz"; - sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64"; - name = "breeze-grub-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz"; + sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64"; + name = "breeze-grub-5.15.5.tar.xz"; }; }; breeze-gtk = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz"; - sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4"; - name = "breeze-gtk-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz"; + sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8"; + name = "breeze-gtk-5.15.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz"; - sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37"; - name = "breeze-plymouth-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz"; + sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8"; + name = "breeze-plymouth-5.15.5.tar.xz"; }; }; discover = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz"; - sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b"; - name = "discover-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz"; + sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854"; + name = "discover-5.15.5.tar.xz"; }; }; drkonqi = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz"; - sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx"; - name = "drkonqi-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz"; + sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e"; + name = "drkonqi-5.15.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz"; - sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym"; - name = "kactivitymanagerd-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz"; + sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db"; + name = "kactivitymanagerd-5.15.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz"; - sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg"; - name = "kde-cli-tools-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz"; + sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace"; + name = "kde-cli-tools-5.15.5.tar.xz"; }; }; kdecoration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz"; - sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh"; - name = "kdecoration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz"; + sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f"; + name = "kdecoration-5.15.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz"; - sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8"; - name = "kde-gtk-config-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz"; + sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185"; + name = "kde-gtk-config-5.15.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz"; - sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn"; - name = "kdeplasma-addons-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz"; + sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3"; + name = "kdeplasma-addons-5.15.5.tar.xz"; }; }; kgamma5 = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz"; - sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my"; - name = "kgamma5-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz"; + sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7"; + name = "kgamma5-5.15.5.tar.xz"; }; }; khotkeys = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz"; - sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5"; - name = "khotkeys-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz"; + sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127"; + name = "khotkeys-5.15.5.tar.xz"; }; }; kinfocenter = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz"; - sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr"; - name = "kinfocenter-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz"; + sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8"; + name = "kinfocenter-5.15.5.tar.xz"; }; }; kmenuedit = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz"; - sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab"; - name = "kmenuedit-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz"; + sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26"; + name = "kmenuedit-5.15.5.tar.xz"; }; }; kscreen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz"; - sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f"; - name = "kscreen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz"; + sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7"; + name = "kscreen-5.15.5.tar.xz"; }; }; kscreenlocker = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz"; - sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna"; - name = "kscreenlocker-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz"; + sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd"; + name = "kscreenlocker-5.15.5.tar.xz"; }; }; ksshaskpass = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz"; - sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s"; - name = "ksshaskpass-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz"; + sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e"; + name = "ksshaskpass-5.15.5.tar.xz"; }; }; ksysguard = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz"; - sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q"; - name = "ksysguard-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz"; + sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a"; + name = "ksysguard-5.15.5.tar.xz"; }; }; kwallet-pam = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz"; - sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793"; - name = "kwallet-pam-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz"; + sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e"; + name = "kwallet-pam-5.15.5.tar.xz"; }; }; kwayland-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz"; - sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h"; - name = "kwayland-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz"; + sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17"; + name = "kwayland-integration-5.15.5.tar.xz"; }; }; kwin = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz"; - sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw"; - name = "kwin-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz"; + sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805"; + name = "kwin-5.15.5.tar.xz"; }; }; kwrited = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz"; - sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v"; - name = "kwrited-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz"; + sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510"; + name = "kwrited-5.15.5.tar.xz"; }; }; libkscreen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz"; - sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj"; - name = "libkscreen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz"; + sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87"; + name = "libkscreen-5.15.5.tar.xz"; }; }; libksysguard = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz"; - sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj"; - name = "libksysguard-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz"; + sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0"; + name = "libksysguard-5.15.5.tar.xz"; }; }; milou = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz"; - sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01"; - name = "milou-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz"; + sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9"; + name = "milou-5.15.5.tar.xz"; }; }; oxygen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz"; - sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb"; - name = "oxygen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz"; + sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c"; + name = "oxygen-5.15.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz"; - sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar"; - name = "plasma-browser-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz"; + sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b"; + name = "plasma-browser-integration-5.15.5.tar.xz"; }; }; plasma-desktop = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz"; - sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91"; - name = "plasma-desktop-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz"; + sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741"; + name = "plasma-desktop-5.15.5.tar.xz"; }; }; plasma-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz"; - sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735"; - name = "plasma-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz"; + sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621"; + name = "plasma-integration-5.15.5.tar.xz"; }; }; plasma-nm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz"; - sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz"; - name = "plasma-nm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz"; + sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee"; + name = "plasma-nm-5.15.5.tar.xz"; }; }; plasma-pa = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz"; - sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125"; - name = "plasma-pa-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz"; + sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92"; + name = "plasma-pa-5.15.5.tar.xz"; }; }; plasma-sdk = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz"; - sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw"; - name = "plasma-sdk-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz"; + sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329"; + name = "plasma-sdk-5.15.5.tar.xz"; }; }; plasma-tests = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz"; - sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg"; - name = "plasma-tests-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz"; + sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827"; + name = "plasma-tests-5.15.5.tar.xz"; }; }; plasma-vault = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz"; - sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy"; - name = "plasma-vault-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz"; + sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5"; + name = "plasma-vault-5.15.5.tar.xz"; }; }; plasma-workspace = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz"; - sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59"; - name = "plasma-workspace-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz"; + sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973"; + name = "plasma-workspace-5.15.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz"; - sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4"; - name = "plasma-workspace-wallpapers-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz"; + sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945"; + name = "plasma-workspace-wallpapers-5.15.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz"; - sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190"; - name = "plymouth-kcm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz"; + sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa"; + name = "plymouth-kcm-5.15.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.3"; + version = "1-5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz"; - sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy"; - name = "polkit-kde-agent-1-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz"; + sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267"; + name = "polkit-kde-agent-1-5.15.5.tar.xz"; }; }; powerdevil = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz"; - sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14"; - name = "powerdevil-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz"; + sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06"; + name = "powerdevil-5.15.5.tar.xz"; }; }; sddm-kcm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz"; - sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2"; - name = "sddm-kcm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz"; + sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b"; + name = "sddm-kcm-5.15.5.tar.xz"; }; }; systemsettings = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz"; - sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2"; - name = "systemsettings-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz"; + sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a"; + name = "systemsettings-5.15.5.tar.xz"; }; }; user-manager = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz"; - sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4"; - name = "user-manager-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz"; + sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431"; + name = "user-manager-5.15.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz"; - sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7"; - name = "xdg-desktop-portal-kde-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz"; + sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50"; + name = "xdg-desktop-portal-kde-5.15.5.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index e2c3c8fe587b2..6a18c05f38e5d 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib , gcc48, gcc49, gcc5, gcc6, gcc7 , xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc +, addOpenGLRunpath }: let @@ -39,7 +40,7 @@ let outputs = [ "out" "lib" "doc" ]; - nativeBuildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ ncurses5 expat python zlib glibc @@ -143,10 +144,19 @@ let else rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 fi - patchelf --set-rpath $rpath2 --force-rpath $i + patchelf --set-rpath "$rpath2" --force-rpath $i done < <(find $out $lib $doc -type f -print0) ''; + # Set RPATH so that libcuda and other libraries in + # /run/opengl-driver(-32)/lib can be found. See the explanation in + # addOpenGLRunpath. Don't try to figure out which libraries really need + # it, just patch all (but not the stubs libraries). Note that + # --force-rpath prevents changing RPATH (set above) to RUNPATH. + postFixup = '' + addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so + ''; + # cuda-gdb doesn't run correctly when not using sandboxing, so # temporarily disabling the install check. This should be set to true # when we figure out how to get `cuda-gdb --version` to run correctly diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix deleted file mode 100644 index 4ccd00af68466..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - name = "clang-${version}"; - - unpackPhase = '' - unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"} - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - buildInputs = [ cmake libxml2 llvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./purity.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - ''; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - ''; - - enableParallelBuilding = true; - - passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch deleted file mode 100644 index ee73b26eb5cec..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/purity.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2015-07-31 00:47:41.000000000 +0200 -+++ b/lib/Driver/Tools.cpp 2015-09-11 21:30:50.057895565 +0200 -@@ -8150,15 +8150,6 @@ - CmdArgs.push_back("-shared"); - } - -- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb || -- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix deleted file mode 100644 index 3c557711449ff..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl -, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - version = "3.7.1"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; - clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv isl version fetch; }); - in { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch deleted file mode 100644 index bf83f169cfc35..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt ---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 -+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 -@@ -56,7 +56,7 @@ - "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" - "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() -@@ -64,14 +64,14 @@ - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix deleted file mode 100644 index 7b7ac7297ba3f..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation rec { - name = "libc++-${version}"; - - src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") - ''; - - patches = [ - ./darwin.patch - ./r242056.patch - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ]; - - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch deleted file mode 100644 index 96245e76653a6..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/include/string 2015/07/13 20:04:56 242056 -+++ b/include/string 2015/07/18 20:40:46 242623 -@@ -1936,7 +1936,12 @@ - template <class _CharT, class _Traits, class _Allocator> - inline _LIBCPP_INLINE_VISIBILITY - basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a) -- : __r_(__a) -+#if _LIBCPP_STD_VER <= 14 -+ _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value) -+#else -+ _NOEXCEPT -+#endif -+: __r_(__a) - { - #if _LIBCPP_DEBUG_LEVEL >= 2 - __get_db()->__insert_c(this); diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh deleted file mode 100644 index 6611259165ae2..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index 5ee8f6b82305c..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index 1989558..1e42905 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -34,10 +34,10 @@ - # include <support/solaris/xlocale.h> - #elif defined(_NEWLIB_VERSION) - # include <support/newlib/xlocale.h> --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include <xlocale.h> --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix deleted file mode 100644 index 2c79d7b3b1b56..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }: - -let - # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version - llvm38-and-above = fetchpatch { - url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch"; - sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr"; - }; -in stdenv.mkDerivation { - name = "libc++abi-${version}"; - - src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - ''; - - # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract - # into the libc++abi build environment above. - prePatch = ''( - cd ../libcxx-* - patch -p1 < ${llvm38-and-above} - )''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix deleted file mode 100644 index 294410f99869a..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python2 -, version -}: - -stdenv.mkDerivation { - name = "lldb-${version}"; - - src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; - - preConfigure = '' - export CXXFLAGS="-pthread" - export LDFLAGS="-ldl" - ''; - - cmakeFlags = [ - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" - "-DPYTHON_VERSION_MAJOR=2" - "-DPYTHON_VERSION_MINOR=7" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix deleted file mode 100644 index a6fd18f94d68b..0000000000000 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python2 -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, libcxxabi -, debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin -}: - -let - src = fetch "llvm" "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"; -in stdenv.mkDerivation rec { - name = "llvm-${version}"; - - unpackPhase = '' - unpackFile ${src} - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = [ perl groff cmake libxml2 python2 libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; - - propagatedBuildInputs = [ ncurses zlib ]; - - # The goal here is to disable LLVM bindings (currently go and ocaml) regardless - # of whether the impure CMake search sheananigans find the compilers in global - # paths. This mostly exists because sandbox builds don't work very well on Darwin - # and sometimes you get weird behavior if CMake finds go in your system path. - # This would be far prettier if there were a CMake option to just disable bindings - # but from what I can tell, there isn't such a thing. The file in question only - # contains `if(WIN32)` conditions to check whether to disable bindings, so making - # those always succeed has the net effect of disabling all bindings. - prePatch = '' - substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)" - '' - + stdenv.lib.optionalString (stdenv ? glibc) '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - patches = stdenv.lib.optionals (!stdenv.isDarwin) [ - # llvm-config --libfiles returns (non-existing) static libs - ../fix-llvm-config.patch - ]; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optional enableSharedLibraries - "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ]; - - NIX_LDFLAGS = "-lpthread"; # no idea what's the problem - - postBuild = '' - rm -fR $out - ''; - - enableParallelBuilding = true; - - passthru.src = src; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 8ec249ed360a7..72626ec0014ba 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkcl-${version}"; - version = "1.1.10.2017-11-14"; + version = "1.1.11"; src = fetchFromGitHub { owner = "jcbeaudoin"; repo = "mkcl"; - rev = "d3f5afe945907153db2be5a17a419966f83d7653"; - sha256 = "1jfmnh96b5dy1874a9y843vihd14ya4by46rb4h5izldp6x3j3kl"; + rev = "v${version}"; + sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9b98004310050..59264ca6efad5 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,11 +17,11 @@ let llvmShared = llvm_7.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; - version = "1.34.0"; + version = "1.34.2"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s"; + sha256 = "0mig0prkmlnpbba1cmi17vlsl88ikv5pi26zjy2kcr64l62lm6n6"; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 8f005d475dc7e..a4fb9b6c6d81d 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, ncurses, python2 , z3Support ? true, z3 ? null }: @@ -6,14 +6,15 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.7"; - rev = "6da8b019e4a155d1f70abe7a3acc0f9765480a9e"; - sha256 = "0ii868r0ra6brjnn453kxqvw76p4bwjbvdyqfcn6v1bl2h4s60ir"; + version = "0.5.8"; + rev = "23d335f28e4055e67c3b22466ac7c4e41dc48344"; + sha256 = "10fa4qwfr3gfvxkzzjfs0w2fyij67cczklpj2x5hghcg08amkq37"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; }; + buildSharedLibs = stdenv.hostPlatform.isLinux; in stdenv.mkDerivation { name = "solc-${version}"; @@ -24,9 +25,7 @@ stdenv.mkDerivation { inherit rev sha256; }; - patches = [ - ./patches/shared-libs-install.patch - ]; + patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; postPatch = '' touch prerelease.txt @@ -37,18 +36,41 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" + ] ++ stdenv.lib.optionals buildSharedLibs [ "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" ]; - doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:./test/tools/yulInterpreter:$LD_LIBRARY_PATH " + - "./test/soltest -p true -- --no-ipc --no-smt --testpath ../test"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ stdenv.lib.optionals z3Support [ z3 ]; + buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ]; + checkInputs = [ ncurses python2 ]; + + # Test fails on darwin for unclear reason + doCheck = stdenv.hostPlatform.isLinux; + + checkPhase = '' + while IFS= read -r -d ''' dir + do + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$dir + export LD_LIBRARY_PATH + done < <(find . -type d -print0) + + pushd .. + # IPC tests need aleth avaliable, so we disable it + sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh + for i in ./scripts/*.sh; do + patchShebangs "$i" + done + for i in ./scripts/*.py; do + patchShebangs "$i" + done + for i in ./test/*.sh; do + patchShebangs "$i" + done + TERM=xterm ./scripts/tests.sh + popd + ''; outputs = [ "out" "dev" ]; @@ -57,7 +79,7 @@ stdenv.mkDerivation { homepage = https://github.com/ethereum/solidity; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dbrock akru lionello ]; + maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; inherit version; }; } diff --git a/pkgs/development/compilers/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch deleted file mode 100644 index 5ef289f53e935..0000000000000 --- a/pkgs/development/compilers/souper/cmake-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600 -+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600 -@@ -33,7 +33,10 @@ - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+ -+if (LLVM_SYSTEM_LIBS) -+ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+endif() - - execute_process( - COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix deleted file mode 100644 index 2203dc980b132..0000000000000 --- a/pkgs/development/compilers/souper/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper -, llvmPackages_4, hiredis, z3, gtest -}: - -let - klee = fetchFromGitHub { - owner = "rsas"; - repo = "klee"; - rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f"; - sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz"; - }; -in stdenv.mkDerivation rec { - name = "souper-unstable-${version}"; - version = "2017-03-23"; - - src = fetchFromGitHub { - owner = "google"; - repo = "souper"; - rev = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc"; - sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl"; - }; - - nativeBuildInputs = [ - cmake - makeWrapper - ]; - - buildInputs = [ - llvmPackages_4.llvm - llvmPackages_4.clang-unwrapped - hiredis - gtest - ]; - - patches = [ ./cmake-fix.patch ]; - - enableParallelBuilding = true; - - preConfigure = '' - mkdir -pv third_party - cp -R "${klee}" third_party/klee - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v ./souper $out/bin/ - cp -v ./clang-souper $out/bin/ - wrapProgram "$out/bin/souper" \ - --add-flags "-z3-path=\"${z3}/bin/z3\"" - ''; - - meta = with stdenv.lib; { - description = "A superoptimizer for LLVM IR"; - homepage = "https://github.com/google/souper"; - license = licenses.asl20; - maintainers = with maintainers; [ taktoa ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 312facde94892..b1f9ee799e5c2 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -37,26 +37,20 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out/lib - cp -v release/lib/terra.so $out/lib - - mkdir -pv $bin/bin - cp -v release/bin/terra $bin/bin - - mkdir -pv $static/lib - cp -v release/lib/libterra.a $static/lib + install -Dm755 -t $bin/bin release/bin/terra + install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} + install -Dm644 -t $static/lib release/lib/libterra.a mkdir -pv $dev/include cp -rv release/include/terra $dev/include - '' - ; + ''; buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; description = "A low-level counterpart to Lua"; - platforms = [ "x86_64-linux" ]; + homepage = http://terralang.org/; + platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; }; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 1590075dc2a01..19056ec2b6fdc 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,37 +1,46 @@ -{ fetchFromGitHub, fetchpatch, stdenv, makeWrapper, unzip, libxml2, m4, uthash }: +{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }: stdenv.mkDerivation rec { - name = "z88dk-${version}"; - version = "20180217"; - rev = "49a7c6032b2675af742f5b0b3aa5bd5260bdd814"; - short_rev = "${builtins.substring 0 7 rev}"; + pname = "z88dk"; + version = "unstable-2019-05-09"; src = fetchFromGitHub { owner = "z88dk"; repo = "z88dk"; - inherit rev; - sha256 = "00vbklh6lkq1gyd08ig2vcg6c1mghvlwfx3vq3wldf34hcs3k4pp"; + rev = "826d68632c3a7c17df88dd2ec54571a6041da69c"; + sha256 = "104qgb01sdb97mkcxnq1cdlqi5qvjm4rd9bg5r42pdfz81ss49xj"; + fetchSubmodules = true; }; - # https://github.com/z88dk/z88dk/pull/612 - patches = [(fetchpatch { - url = "https://github.com/Mic92/z88dk/commit/5b4ca132fa1f31c9ac48cf2220358715739ca0b2.patch"; - sha256 = "1p2l31j68p7jzykhkhd9iagn2lr08hdclk3cl9l32p1q6ghdipfv"; - })]; - postPatch = '' # we dont rely on build.sh : export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite export ZCCCFG=$PWD/lib/config/ + # we don't want to build zsdcc since it required network (svn) + # we test in checkPhase + substituteInPlace Makefile \ + --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ + --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' + ''; + + checkPhase = '' + make testsuite ''; + #failed on Issue_1105_function_pointer_calls + doCheck = stdenv.hostPlatform.system != "aarch64-linux"; + + #_FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = "-O"; + short_rev = "${builtins.substring 0 7 src.rev}"; makeFlags = [ - "prefix=$(out)" "git_rev=${short_rev}" "version=${version}" + "prefix=$(out)" "git_count=0" ]; - nativeBuildInputs = [ makeWrapper unzip ]; + + nativeBuildInputs = [ which makeWrapper unzip ]; buildInputs = [ libxml2 m4 uthash ]; preInstall = '' @@ -41,10 +50,10 @@ stdenv.mkDerivation rec { installTargets = "libs install"; meta = with stdenv.lib; { - homepage = https://www.z88dk.org; + homepage = "https://www.z88dk.org"; description = "z80 Development Kit"; license = licenses.clArtistic; maintainers = [ maintainers.genesis ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0d5a892e2e963..14a7f2dc4e245 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, coq }: -let params = - let v_8_8_0 = { - rev = "V8.8.0"; - sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; +let params = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; + "8.8" = { + rev = "V8.8.0"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; + "8.9" = { + rev = "V8.9.0"; + sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; + }; }; - in - { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; - "8.8" = v_8_8_0; - "8.9" = v_8_8_0; - }; - param = params."${coq.coq-version}" -; in + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 86e5687321b40..b31fcde1b80bd 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,15 @@ let }; "8.8" = { - version = "1.0"; - rev = "v1.0-8.8"; - sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.8"; + sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; }; "8.9" = { - version = "1.2beta"; - rev = "v1.2-beta-8.9"; - sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.9"; + sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; }; }; param = params."${coq.coq-version}"; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix new file mode 100644 index 0000000000000..30917fcb78f23 --- /dev/null +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, which, coq }: + +let params = { + "8.7" = { + version = "0.1"; + rev = "v0.1-8.7"; + sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; + }; + "8.8" = { + version = "0.1"; + rev = "0.1"; + sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; + }; + "8.9" = { + version = "0.1"; + rev = "a69551a49543b22a7d4e6a2484356b56bd05068e"; + sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; + }; +}; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + inherit (param) version; + name = "coq${coq.coq-version}-ltac2-${version}"; + + src = fetchFromGitHub { + owner = "coq"; + repo = "ltac2"; + inherit (param) rev sha256; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A robust and expressive tactic language for Coq"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index aa6da1a1e28c9..a9933692db3b6 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -16,9 +16,10 @@ let "1.6.1" = flip elem ["8.5"]; }; # computes the default version of mathcomp given a version of Coq - min-mathcomp-version = head (naturalSort (attrNames mathcomp-coq-versions)); - default-mathcomp-version = last (naturalSort ([min-mathcomp-version] + max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions)); + default-mathcomp-version = let v = last (naturalSort (["0.0.0"] ++ (attrNames (filterAttrs (_: vs: vs coq.coq-version) mathcomp-coq-versions)))); + in if v == "0.0.0" then max-mathcomp-version else v; # list of core mathcomp packages sorted by dependency order mathcomp-packages = diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index ef387985e0623..3666d54a78694 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -75,11 +75,9 @@ packageGen = { mathcomp ? current-mathcomp, license ? mathcomp.meta.license, # mandatory - package, version, version-sha256, description + package, version ? "broken", version-sha256, description }: - if version == "" then {} - else { "${package}" = - let from = src; in + { "${package}" = let from = src; in stdenv.mkDerivation rec { inherit version; @@ -102,19 +100,20 @@ packageGen = { inherit (src.meta) homepage; inherit (mathcomp.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; + broken = (version == "broken"); }; passthru = { inherit version-sha256; - compatibleCoqVersions = v: builtins.elem v coq-versions; + compatibleCoqVersions = if meta.broken then _: false else + v: builtins.elem v coq-versions; }; - };}; + }; + }; -current-versions = versions."${current-mathcomp.version}" - or (throw "no mathcomp extra packages found for mathcomp ${current-mathcomp.version}"); +current-versions = versions."${current-mathcomp.version}" or {}; -select = x: mapAttrs (n: pkg: {package = n;} // pkg) - (recursiveUpdate (overrideExisting x param) x); +select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); all = (mapAttrs' (n: pkg: {name = "mathcomp_1_7-${n}"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index fed0234b46c24..ca1bab1e087e7 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -54,6 +54,7 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" + mkdir -p "''${GOPATH}/pkg/mod/cache/download" runHook postConfigure ''; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 4bd49b06796dc..592e6ad89994e 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index c3aa840079174..cea464ad5d279 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -4,23 +4,18 @@ assert stdenv ? cc && stdenv.cc.isGNU; let name = "guile-lib-${version}"; - version = "0.2.2"; + version = "0.2.6.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"; + sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile texinfo ]; - # One test doesn't seem to be compatible with guile_2_2. - patchPhase = '' - sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile* - ''; - doCheck = true; preCheck = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ba1e461feab1c..f5c6f3da14aa9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -165,10 +165,7 @@ self: super: { then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else appendPatch super.hakyll (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/pull/691/commits/a44ad37cd15310812e78f7dab58d6d460451f20c.patch"; - sha256 = "13xpznm19rjp51ds165ll9ahyps1r4131c77b8r7gpjd6i505832"; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion @@ -1236,8 +1233,9 @@ self: super: { pandoc = doDistribute super.pandoc_2_7_2; pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - # https://github.com/qfpl/tasty-hedgehog/issues/24 - tasty-hedgehog = dontCheck super.tasty-hedgehog; + # Current versions of tasty-hedgehog need hedgehog 1.x, which + # we don't have in LTS-13.x. + tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; }; # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" @@ -1267,4 +1265,21 @@ self: super: { # Haddock failure: https://github.com/haskell/haddock/issues/979 esqueleto = dontHaddock (dontCheck super.esqueleto); + # Requires API keys to run tests + algolia = dontCheck super.algolia; + + # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but + # hspec which isn't in stackage is already past that + antiope-s3 = doJailbreak super.antiope-s3; + + # Has tasty < 1.2 requirement, but works just fine with 1.2 + temporary-resourcet = doJailbreak super.temporary-resourcet; + + # Tests require internet + dhall_1_23_0 = dontCheck super.dhall_1_23_0; + + # Requires dhall >= 1.23.0 + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe76c581edaac..936e8c15291e5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.20 + # LTS Haskell 13.22 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -196,7 +196,7 @@ default-package-overrides: - apecs-gloss ==0.2.0 - apecs-physics ==0.3.2 - api-field-json-th ==0.1.0.2 - - appar ==0.1.7 + - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 @@ -282,7 +282,7 @@ default-package-overrides: - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.5.1 + - binary-tagged ==0.1.5.2 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 @@ -342,8 +342,8 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - - bytestring-strict-builder ==0.4.5.1 - - bytestring-tree-builder ==0.2.7.2 + - bytestring-strict-builder ==0.4.5.2 + - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 @@ -458,7 +458,7 @@ default-package-overrides: - conduit-throttle ==0.3.1.0 - conduit-zstd ==0.0.1.1 - confcrypt ==0.1.0.4 - - configuration-tools ==0.4.0 + - configuration-tools ==0.4.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 @@ -563,7 +563,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.6 + - dbus ==1.2.7 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -795,7 +795,7 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - - generics-sop-lens ==0.1.2.1 + - generics-sop-lens ==0.1.3 - genvalidity ==0.7.0.2 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 @@ -804,7 +804,7 @@ default-package-overrides: - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 - - genvalidity-hspec-hashable ==0.2.0.3 + - genvalidity-hspec-hashable ==0.2.0.4 - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - genvalidity-property ==0.3.0.0 @@ -823,7 +823,7 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - - ghc-syntax-highlighter ==0.0.3.1 + - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3 - ghc-typelits-knownnat ==0.6 @@ -895,7 +895,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.2 - - happy ==1.19.9 + - happy ==1.19.10 - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 @@ -916,7 +916,7 @@ default-package-overrides: - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - - haskey-btree ==0.3.0.0 + - haskey-btree ==0.3.0.1 - haskoin-core ==0.8.4 - hasql ==1.3.0.5 - hasql-optparse-applicative ==0.3.0.3 @@ -965,7 +965,7 @@ default-package-overrides: - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 - hmpfr ==0.4.4 - - hoauth2 ==1.8.5 + - hoauth2 ==1.8.6 - Hoed ==0.5.1 - hOpenPGP ==2.7.4.1 - hopfli ==0.2.2.1 @@ -979,7 +979,7 @@ default-package-overrides: - hpack-dhall ==0.5.2 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.6 + - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 - hschema ==0.0.1.1 @@ -1000,7 +1000,7 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.3 + - hslua ==1.0.3.1 - hslua-aeson ==1.0.0 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 @@ -1028,7 +1028,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 - - HsYAML ==0.1.1.3 + - HsYAML ==0.1.2.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 - HTF ==0.13.2.5 @@ -1046,7 +1046,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7.1 - http-date ==0.0.8 - - http-directory ==0.1.1 + - http-directory ==0.1.2 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1063,7 +1063,7 @@ default-package-overrides: - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - - hw-diagnostics ==0.0.0.5 + - hw-diagnostics ==0.0.0.7 - hweblib ==0.6.3 - hw-eliasfano ==0.1.0.1 - hw-excess ==0.2.0.2 @@ -1146,8 +1146,8 @@ default-package-overrides: - IPv6Addr ==1.1.2 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - - irc-client ==1.1.0.5 - - irc-conduit ==0.3.0.1 + - irc-client ==1.1.0.6 + - irc-conduit ==0.3.0.2 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 @@ -1170,11 +1170,11 @@ default-package-overrides: - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - JuicyPixels ==3.3.3 - - JuicyPixels-extra ==0.4.0 + - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - kan-extensions ==5.2 - - kanji ==3.4.0 + - kanji ==3.4.0.2 - katip ==0.7.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 @@ -1257,7 +1257,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.3 + - logging-effect ==1.3.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.3 @@ -1310,7 +1310,7 @@ default-package-overrides: - microbench ==0.1 - microformats2-parser ==1.0.1.9 - microlens ==0.4.10 - - microlens-aeson ==2.3.0.1 + - microlens-aeson ==2.3.0.4 - microlens-contra ==0.1.0.2 - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 @@ -1427,10 +1427,10 @@ default-package-overrides: - network-multicast ==0.2.0 - network-simple ==0.4.3 - network-simple-tls ==0.3.2 - - network-transport ==0.5.2 + - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - - newtype ==0.2 + - newtype ==0.2.1.0 - newtype-generics ==0.5.3 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 @@ -1445,7 +1445,7 @@ default-package-overrides: - non-negative ==0.1.2 - nowdoc ==0.1.1.0 - nqe ==0.6.1 - - nsis ==0.3.2 + - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 @@ -1472,7 +1472,7 @@ default-package-overrides: - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - - OpenGL ==3.0.2.2 + - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 @@ -1505,11 +1505,11 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.2 + - parser-combinators ==1.0.3 - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.0 + - partial-semigroup ==0.5.1.1 - path ==0.6.1 - path-extra ==0.2.0 - path-io ==1.4.2 @@ -1540,7 +1540,7 @@ default-package-overrides: - persistent-postgresql ==2.9.1 - persistent-sqlite ==2.9.3 - persistent-template ==2.5.4 - - pgp-wordlist ==0.1.0.2 + - pgp-wordlist ==0.1.0.3 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 @@ -1602,7 +1602,7 @@ default-package-overrides: - prettyprinter-compat-wl-pprint ==1.0.0.1 - pretty-show ==1.9.5 - pretty-simple ==2.2.0.1 - - pretty-sop ==0.2.0.2 + - pretty-sop ==0.2.0.3 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.4.0 @@ -1640,7 +1640,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.7 + - pusher-http-haskell ==1.5.1.8 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.4 @@ -1685,9 +1685,9 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.3.1 + - rebase ==1.3.1.1 - record-dot-preprocessor ==0.1.5 - - records-sop ==0.1.0.2 + - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 - refact ==0.3.0.2 @@ -1704,16 +1704,16 @@ default-package-overrides: - regex-pcre-builtin ==0.94.4.8.8.35 - regex-pcre-text ==0.94.0.1 - regex-posix ==0.95.2 - - regex-tdfa ==1.2.3.1 + - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.6 + - registry ==0.1.5.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.1.0 - - relational-query-HDBC ==0.7.1.1 + - relational-query ==0.12.2.1 + - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - - relational-schemas ==0.1.6.2 + - relational-schemas ==0.1.7.0 - relude ==0.4.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 @@ -1723,7 +1723,7 @@ default-package-overrides: - req ==1.2.1 - req-conduit ==1.0.0 - req-url-extra ==0.1.0.0 - - rerebase ==1.3.1 + - rerebase ==1.3.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 @@ -1786,7 +1786,7 @@ default-package-overrides: - semigroups ==0.18.5 - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - - semver ==0.3.3.1 + - semver ==0.3.4 - sendfile ==0.7.10 - seqalign ==0.2.0.4 - serf ==0.1.1.0 @@ -1898,7 +1898,7 @@ default-package-overrides: - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 - sqlite-simple-errors ==0.6.1.0 - - sql-words ==0.1.6.2 + - sql-words ==0.1.6.3 - srcloc ==0.5.1.2 - stache ==2.0.1 - stack2nix ==0.2.3 @@ -1927,7 +1927,7 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.29.1 - streaming ==0.2.2.0 - - streaming-attoparsec ==1.0.0 + - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 - streaming-wai ==0.1.1 @@ -1993,7 +1993,7 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10 + - tasty-quickcheck ==0.10.1 - tasty-silver ==3.1.12 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 @@ -2022,7 +2022,7 @@ default-package-overrides: - texmath ==0.11.2.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.5 + - text-builder ==0.6.5.1 - text-conversions ==0.3.0 - text-format ==0.3.2 - text-icu ==0.7.0.1 @@ -2057,7 +2057,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.1.0 + - th-utilities ==0.2.3.0 - thyme ==0.3.5.5 - tidal ==1.0.13 - tile ==0.3.0.0 @@ -2089,10 +2089,10 @@ default-package-overrides: - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.4 + - transformers-compat ==0.6.5 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.2 + - tree-diff ==0.0.2.1 - tree-fun ==0.8.1.0 - trifecta ==2 - triplesec ==0.2.2.0 @@ -2201,7 +2201,7 @@ default-package-overrides: - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 - - void ==0.7.2 + - void ==0.7.3 - vty ==5.25.1 - wai ==3.2.2 - wai-app-static ==3.1.6.3 @@ -2229,7 +2229,7 @@ default-package-overrides: - warp-tls-uid ==0.2.0.6 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.8.3.1 + - web3 ==0.8.3.2 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 @@ -2239,12 +2239,12 @@ default-package-overrides: - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - - websockets-snap ==0.10.3.0 + - websockets-snap ==0.10.3.1 - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.11 - - wild-bind ==0.1.2.3 - - wild-bind-x11 ==0.2.0.6 + - wild-bind ==0.1.2.4 + - wild-bind-x11 ==0.2.0.7 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - winery ==0.3.1 @@ -2321,7 +2321,7 @@ default-package-overrides: - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.1 + - yesod-markdown ==0.12.6.2 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.2 - yesod-persistent ==1.6.0.2 @@ -2337,7 +2337,7 @@ default-package-overrides: - yjtools ==0.9.18 - yoga ==0.0.0.5 - youtube ==0.2.1.1 - - zero ==0.1.4 + - zero ==0.1.5 - zeromq4-haskell ==0.7.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 @@ -2625,11 +2625,9 @@ broken-packages: - AC-VanillaArray - AC-Vector - AC-Vector-Fancy - - accelerate - accelerate-arithmetic - accelerate-fftw - accelerate-fourier - - accelerate-io - accelerate-llvm - accelerate-llvm-native - accelerate-random @@ -2736,7 +2734,6 @@ broken-packages: - algebraic - algebraic-prelude - algo-s - - algolia - AlgoRhythm - AlgorithmW - align-text @@ -2757,7 +2754,8 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka-s3-streaming + - amazonka-cognito-identity + - amazonka-ecs - amby - AMI - ampersand @@ -2789,10 +2787,6 @@ broken-packages: - anticiv - antigate - antimirov - - antiope-contract - - antiope-messages - - antiope-s3 - - antiope-sqs - antisplice - antlr-haskell - antlrc @@ -2963,11 +2957,13 @@ broken-packages: - aws-sign4 - aws-simple - aws-sns + - axel - axiom - azubi - azure-service-api - azure-servicebus - azurify + - b9 - babylon - backdropper - backtracking-exceptions @@ -3010,6 +3006,7 @@ broken-packages: - battleship-combinatorics - battleships - bayes-stack + - bbi - BCMtools - bdcs - bdcs-api @@ -3054,6 +3051,7 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree + - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3321,6 +3319,7 @@ broken-packages: - cabin - cabocha - cached + - cacophony - caffegraph - cairo-core - cake @@ -3550,6 +3549,7 @@ broken-packages: - cmt - cmv - cnc-spec-compiler + - co-log - co-log-polysemy - co-log-sys - Coadjute @@ -3591,6 +3591,7 @@ broken-packages: - combinatorial-problems - Combinatorrent - combobuffer + - comfort-array - comic - Command - commander @@ -3696,6 +3697,8 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous + - contiguous-checked - contiguous-fft - continue - continuum @@ -4006,6 +4009,7 @@ broken-packages: - derp-lib - descript-lang - deterministic-game-engine + - detour-via-sci - detour-via-uom - deunicode - devil @@ -4018,7 +4022,6 @@ broken-packages: - dgs - dhall-check - dhall-nix - - dhall-to-cabal - dhcp-lease-parser - di - di-df1 @@ -4197,6 +4200,7 @@ broken-packages: - Dust-crypto - Dust-tools - Dust-tools-pcap + - dvault - dvda - dvdread - dvi-processing @@ -4312,6 +4316,7 @@ broken-packages: - eros - eros-client - eros-http + - error-codes - error-context - error-continuations - error-list @@ -4542,6 +4547,7 @@ broken-packages: - flexiwrap - flexiwrap-smallcheck - flickr + - flight-kml - Flippi - flite - float-binstring @@ -4821,6 +4827,7 @@ broken-packages: - gi-wnck - giak - Gifcurry + - ginger - ginsu - gipeda - gist @@ -4833,6 +4840,7 @@ broken-packages: - git-jump - git-monitor - git-object + - git-remote-ipfs - git-repair - git-sanity - git-vogue @@ -5085,7 +5093,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5187,6 +5194,7 @@ broken-packages: - harvest-api - has - has-th + - HasBigDecimal - HasCacBDD - hascas - Haschoo @@ -5429,7 +5437,9 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens + - hedgehog-fn - hedgehog-gen-json + - hedgehog-quickcheck - Hedi - hedis-config - hedis-pile @@ -5520,6 +5530,7 @@ broken-packages: - hgrib - hharp - HHDL + - hhp - hi3status - hiccup - hichi @@ -5903,6 +5914,7 @@ broken-packages: - hsx-jmacro - hsx-xhtml - hsXenCtrl + - HsYAML-aeson - hsyscall - hsyslog-tcp - hsyslog-udp @@ -5995,6 +6007,7 @@ broken-packages: - hw-simd - hw-streams - hw-succinct + - hw-uri - hw-vector - hw-xml - hwall-auth-iitk @@ -6044,6 +6057,7 @@ broken-packages: - hypher - hzulip - i18n + - i3blocks-hs-contrib - i3ipc - iap-verifier - ib-api @@ -6174,6 +6188,7 @@ broken-packages: - ip2proxy - ipatch - ipc + - ipld-cid - ipopt-hs - iptables-helpers - iptadmin @@ -6364,6 +6379,7 @@ broken-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-hails-reactivevalues + - kerry - Ketchup - keter - kevin @@ -6490,6 +6506,7 @@ broken-packages: - language-vhdl - language-webidl - lapack + - lapack-comfort-array - Lastik - lat - latest-npm-version @@ -6497,7 +6514,6 @@ broken-packages: - latex-formulae-image - latex-formulae-pandoc - LATS - - lattices - launchpad-control - lawless-concurrent-machines - layers @@ -6519,6 +6535,7 @@ broken-packages: - ldif - leaf - leaky + - lean - leanpub-wreq - leapseconds - learn @@ -6720,6 +6737,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -7088,9 +7106,11 @@ broken-packages: - multi-cabal - multiaddr - multiarg + - multibase - multifile - multifocal - multihash + - multihash-serialise - multilinear - multilinear-io - multipass @@ -7193,6 +7213,7 @@ broken-packages: - netclock - netcore - netease-fm + - netlib-comfort-array - netlines - netrium - NetSNMP @@ -7276,6 +7297,7 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty + - nonempty-containers - NonEmptyList - normalization-insensitive - NoSlow @@ -7302,9 +7324,11 @@ broken-packages: - numerical - numhask - numhask-array + - numhask-hedgehog - numhask-histogram - numhask-prelude - numhask-range + - numhask-space - numhask-test - Nussinov78 - Nutri @@ -7781,10 +7805,14 @@ broken-packages: - prim-array - prim-instances - primes-type + - primitive-addr + - primitive-atomic - primitive-containers - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort + - primitive-unlifted - primula-board - primula-bot - pringletons @@ -8097,6 +8125,7 @@ broken-packages: - regions-mtl - register-machine-typelevel - registry + - registry-hedgehog - regress - regular - regular-extras @@ -8109,6 +8138,7 @@ broken-packages: - relacion - relation - relational-postgresql8 + - relational-record-examples - relative-date - reload - remark @@ -8217,11 +8247,13 @@ broken-packages: - RNAlien - RNAwolf - rncryptor + - rng-utils - rob - robin - robots-txt - roc-cluster - roc-cluster-demo + - rocksdb-query - roku-api - rollbar-hs - roller @@ -9070,10 +9102,12 @@ broken-packages: - tasty-auto - tasty-fail-fast - tasty-groundhog-converters + - tasty-hedgehog-coverage - tasty-integrate - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-lua - tasty-quickcheck-laws - tasty-stats - tasty-tap @@ -9108,7 +9142,6 @@ broken-packages: - templatepg - tempodb - temporal-csound - - temporary-resourcet - tempus - tensor - tensorflow @@ -9426,6 +9459,7 @@ broken-packages: - typelevel-tensor - TypeNat - typeparams + - typerep-map - types-compat - typesafe-precure - typescript-docs @@ -9595,6 +9629,7 @@ broken-packages: - verilog - versioning - versioning-servant + - vflow-types - vfr-waypoints - vgrep - vhd diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ddcfa0ff447cb..01fa97eb25d0f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -768,8 +768,8 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.6.0"; - sha256 = "1f3gq1vd9ra3421ff5an6q33mlfzc2qvaxmfg9qhvr4z99ivqwdz"; + version = "2.6.0.1"; + sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -4846,8 +4846,8 @@ self: { }: mkDerivation { pname = "ENIG"; - version = "0.0.0.2"; - sha256 = "0rnqp6bdib4w683gvj6i0p3p7ms0zw6vwvmsgy9gwfwxqkh6m3ps"; + version = "0.0.1.0"; + sha256 = "1zv6dybsnj3kssiyyg69lxyj5wvi5qjx0xp7skg362xzqmi97ch3"; libraryHaskellDepends = [ base text unicode-transforms vector ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -6221,8 +6221,8 @@ self: { }: mkDerivation { pname = "Frames-map-reduce"; - version = "0.1.0.0"; - sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3"; + version = "0.1.0.1"; + sha256 = "1m3ifx867hn4zhrj9xlars44w3sv1sp6ja38kb6f3lnhr86nf8g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9075,6 +9075,8 @@ self: { pname = "HTF"; version = "0.13.2.5"; sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin"; + revision = "1"; + editedCabalFile = "0l18mp06jjwpjbnvj548naas1xhnc46c8l0pbgzi3bm6siq5hhv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9083,9 +9085,11 @@ self: { pretty process QuickCheck random regex-compat text time unix vector xmlgen ]; + libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ array base cpphs directory HUnit mtl old-time random text ]; + executableToolDepends = [ cpphs ]; testHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath HUnit mtl process random regex-compat template-haskell temporary text @@ -9104,6 +9108,8 @@ self: { pname = "HTTP"; version = "4000.3.13"; sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657"; + revision = "1"; + editedCabalFile = "07wn0skwbmms9g5lyzaaal6cbjffvisampv85r934cqh7kl9wkzh"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9349,16 +9355,16 @@ self: { "HaTeX" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, matrix - , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers - , wl-pprint-extras + , parsec, prettyprinter, QuickCheck, tasty, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "HaTeX"; - version = "3.20.0.1"; - sha256 = "02v4fqrrx5fw3ggrgvanfhaawnci8c7zw9q282bmy19p5sqpj88n"; + version = "3.21.0.0"; + sha256 = "0vavvs83r63sgzz4vyb617xady51ncli4ra9zwjhks8avzw3l1z1"; libraryHaskellDepends = [ - base bytestring containers hashable matrix parsec QuickCheck text - transformers wl-pprint-extras + base bytestring containers hashable matrix parsec prettyprinter + QuickCheck text transformers ]; testHaskellDepends = [ base parsec QuickCheck tasty tasty-quickcheck text @@ -9624,6 +9630,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HasCacBDD" = callPackage @@ -10534,8 +10542,8 @@ self: { ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.3"; - sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x"; + version = "0.1.2.0"; + sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10557,6 +10565,8 @@ self: { ]; description = "JSON to YAML Adapter"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hsed" = callPackage @@ -11052,8 +11062,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "JSONParser"; - version = "0.1.0.3"; - sha256 = "0nznnp9mr36npdzy8avbxbpm07mzm8mz4na1hfyv24g9iqmp31f8"; + version = "0.1.0.4"; + sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26"; libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; @@ -11150,6 +11160,18 @@ self: { broken = true; }) {}; + "Jazzkell" = callPackage + ({ mkDerivation, base, Euterpea, random }: + mkDerivation { + pname = "Jazzkell"; + version = "0.0.1"; + sha256 = "11sqcvdi1msnxn6fp590sy272lv2dp6qlzfard6sp1xnwqxx85nh"; + libraryHaskellDepends = [ base Euterpea random ]; + description = "Library for modeling jazz improvisation"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Jdh" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -11236,8 +11258,8 @@ self: { pname = "JuicyPixels"; version = "3.3.3"; sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c"; - revision = "1"; - editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq"; + revision = "2"; + editedCabalFile = "1vvbvvkpm4vlh0v8d8irzipd5yg1rrd5xdfcm2yibn1h0iqpzdi4"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11288,8 +11310,8 @@ self: { }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.4.0"; - sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; + version = "0.4.1"; + sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -12926,7 +12948,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_4_0_1" = callPackage + "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network , old-locale, old-time, parsec, process, QuickCheck, random @@ -12934,10 +12956,10 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; + version = "1.4.1.0"; + sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; revision = "2"; - editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb"; + editedCabalFile = "1k7d8cgvpmln4imcrfpj4c02n3c5l1gkd5hs4hnar9ln0qh61cfx"; libraryHaskellDepends = [ array base containers directory filepath hslogger HUnit mtl network old-locale old-time parsec process random regex-compat time unix @@ -12949,30 +12971,29 @@ self: { ]; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH" = callPackage + "MissingH_1_4_2_1" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix + , old-locale, old-time, parsec, process, random, regex-compat, time + , unix }: mkDerivation { pname = "MissingH"; - version = "1.4.1.0"; - sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; + version = "1.4.2.1"; + sha256 = "1m9qdgs2ma1svjcagv7qd31xcvym2mnzx001qwchdh46q9y288k1"; libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network + array base containers directory filepath hslogger mtl network old-locale old-time parsec process random regex-compat time unix ]; testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix + base containers directory errorcall-eq-instance filepath HUnit + old-time parsec regex-compat time unix ]; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingK" = callPackage @@ -13198,8 +13219,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; - revision = "2"; - editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k"; + revision = "3"; + editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14510,22 +14531,6 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "3.0.2.2"; - sha256 = "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc"; - libraryHaskellDepends = [ - base bytestring containers GLURaw ObjectName OpenGLRaw StateVar - text transformers - ]; - description = "A binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "OpenGL_3_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName - , OpenGLRaw, StateVar, text, transformers - }: - mkDerivation { - pname = "OpenGL"; version = "3.0.3.0"; sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as"; libraryHaskellDepends = [ @@ -14534,7 +14539,6 @@ self: { ]; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenGLCheck" = callPackage @@ -15852,8 +15856,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "1"; - editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; + revision = "3"; + editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -15871,6 +15875,8 @@ self: { pname = "QuickCheck"; version = "2.13.1"; sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; + revision = "2"; + editedCabalFile = "061d4nf7n75rri0mzz5k50d8v5ja4a6w43fmm990z07vgxm5rj5n"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -18002,6 +18008,8 @@ self: { pname = "Spock"; version = "0.13.0.0"; sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa"; + revision = "1"; + editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -20073,8 +20081,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.3"; - sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; + version = "0.2.2.4"; + sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -20141,8 +20149,8 @@ self: { ({ mkDerivation, Advapi32, base, Win32, Win32-errors }: mkDerivation { pname = "Win32-services"; - version = "0.4"; - sha256 = "1zxi8m98n5pgpx7z20f4g40w4njqllw7gfnlfxwgw3iismxiyyp8"; + version = "0.4.0.1"; + sha256 = "1skf8w3d1n61847bjpvll3bql65mrc6vg03q84bg21mlh77mx1s3"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; @@ -20466,8 +20474,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.6"; - sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j"; + version = "0.1.0.8"; + sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik"; libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; @@ -21147,8 +21155,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-arithmetic" = callPackage @@ -21449,8 +21455,6 @@ self: { ]; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-llvm" = callPackage @@ -23218,22 +23222,21 @@ self: { "aeson-gadt-th" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map - , dependent-sum, hspec, HUnit, markdown-unlit, template-haskell - , transformers + , dependent-sum, dependent-sum-template, hspec, HUnit + , template-haskell, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.1.0"; - sha256 = "09529lpjmm7hpqwrs3w8z1d6zzy4dw5wyqyx88ra68wf2a5nlwsh"; + version = "0.2.1.1"; + sha256 = "18lkf75pw8lp03bj4b8vknj7ysvbhpix6zkzd86qaq0z3yh6s6jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers dependent-sum template-haskell transformers ]; executableHaskellDepends = [ - aeson base dependent-map dependent-sum + aeson base dependent-map dependent-sum dependent-sum-template ]; - executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ aeson aeson-qq base dependent-sum hspec HUnit ]; @@ -24484,6 +24487,8 @@ self: { pname = "alga"; version = "0.2.2"; sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y"; + revision = "1"; + editedCabalFile = "1g1cxg4rxcm53pwlc0wh47s4w8h4lp5dsvnacrc1f5pmjhx3740y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -24699,8 +24704,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "align" = callPackage @@ -25760,6 +25763,8 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -26113,6 +26118,8 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-efs" = callPackage @@ -27174,25 +27181,22 @@ self: { }) {}; "amazonka-s3-streaming" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, deepseq, dlist, exceptions, http-client - , lens, lifted-async, mmap, mmorph, mtl, resourcet + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async, base + , bytestring, conduit, dlist, exceptions, http-client, lens, mmorph + , mtl }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.5"; - sha256 = "1j9jp409gjq7gnwx163i7qpk4ih3rff7z2icsfmzakiarwmg2ff2"; + version = "1.0.0.2"; + sha256 = "1k7l49h3zdqw3va70mr4rrmsyjpbzgbnr3bhj7yl24np77r6cs99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq - dlist exceptions http-client lens lifted-async mmap mmorph mtl - resourcet + amazonka amazonka-core amazonka-s3 async base bytestring conduit + dlist exceptions http-client lens mmorph mtl ]; 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 @@ -28254,6 +28258,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "annotated-fix" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "annotated-fix"; + version = "0.1.0.0"; + sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i"; + libraryHaskellDepends = [ base recursion-schemes ]; + description = "A fixpoint of a functor that can be annotated"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "annotated-wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28337,12 +28352,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_9" = callPackage + "ansi-terminal_0_9_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.9"; - sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp"; + version = "0.9.1"; + sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28353,19 +28368,22 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, hspec, linebreak, split, terminal-size, timers-tick + , clock, hspec, linebreak, mtl, split, terminal-size, timers-tick }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.2.1.0"; - sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836"; + version = "0.3.1.0"; + sha256 = "0q62lq4i638hn23qvmlv7qa6gdnxl3bnrhpp2j2liw885x4qxlhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock linebreak split - terminal-size timers-tick + ansi-terminal array base bytestring cereal clock linebreak mtl + split terminal-size timers-tick + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock hspec linebreak + mtl split terminal-size timers-tick ]; - testHaskellDepends = [ array base hspec linebreak ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -28387,6 +28405,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-wl-pprint_0_6_9" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.9"; + sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { @@ -28533,14 +28565,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_2" = callPackage + "antiope-athena_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.2"; - sha256 = "0jnw1r2qxdsgb2a96ibayy504ndmgwnr083y3hxvsf081bi72n03"; + version = "7.0.3"; + sha256 = "15z64bwqnz7ypv35alj1wfvw0ab1zp0h7sdhw300mq3715snw0x1"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28558,15 +28590,13 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.2"; - sha256 = "0pf9dqx4px93fvq9rsl13ckngylj9dywzapn8largccvw0j5g8zk"; + version = "7.0.3"; + sha256 = "1c2q532dy6zash5ap3mq9qx9316gqhd3ilafvqs3xvfx6gddb7k6"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; 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-core" = callPackage @@ -28591,7 +28621,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_2" = callPackage + "antiope-core_7_0_3" = 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 @@ -28599,8 +28629,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.2"; - sha256 = "1rybjb99sqgs2qa0b2mjrfwi5h8112ipwjphapcbgzg2y7nicw60"; + version = "7.0.3"; + sha256 = "0qn89pij3gg129y4waiwq6y6i7d7lny9ibjz9zdv5n6fzsgmrz8l"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28637,15 +28667,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_2" = callPackage + "antiope-dynamodb_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.2"; - sha256 = "0apbpikpcj400qn4jq0s29rmsbk3ngi7drd8jmkpnnlqvz7g4cyv"; + version = "7.0.3"; + sha256 = "1shfi2l9pys211pxq03z71d53578d2amwlyvsj4cb9qspccqmxb0"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28679,11 +28709,9 @@ self: { unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-messages_7_0_2" = callPackage + "antiope-messages_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28691,8 +28719,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.2"; - sha256 = "1v0wfhniy5gaqnn8b39vc8whzmj9a58zh6l0zz234n5yghggz7fq"; + version = "7.0.3"; + sha256 = "05xrjlm5w2pbx9dlgi800j28zxyhbilhd902f8mshdw5jq7l3ws3"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28705,7 +28733,6 @@ self: { 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-optparse-applicative" = callPackage @@ -28714,8 +28741,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.0.1"; - sha256 = "018jnswibppmr3qzk6bn64r3xg55msp4bzmcg99vkr6nzgjl1zad"; + version = "7.0.3"; + sha256 = "1pw8jhbhn11jjp5zlsx2sdf3swjqcda0ka6xm09wzk14njyj2m0a"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28750,11 +28777,9 @@ self: { network-uri resourcet text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-s3_7_0_2" = callPackage + "antiope-s3_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28763,8 +28788,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.2"; - sha256 = "1g46qy0xxwszx7mnsyd04yi83wf0kv57h4sb1jfq6ds6sh9l0xnc"; + version = "7.0.3"; + sha256 = "0n5jzp1ab3nk99z0n2d4kp400cg2ygxnk9s9siks2qncpgx3bb42"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28780,7 +28805,6 @@ self: { 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-sns" = callPackage @@ -28802,15 +28826,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_2" = callPackage + "antiope-sns_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.2"; - sha256 = "19l0sl33ywr2j5kxkqk0bbpqiahlzn1k883vhyki585hhgh2dad1"; + version = "7.0.3"; + sha256 = "0kq669k1h11cjrx4d0rdyzfv94br5w0pxl0zm0xa0pq4inagz06q"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28845,23 +28869,22 @@ self: { monad-loops network-uri text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-sqs_7_0_2" = callPackage + "antiope-sqs_7_0_3" = 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, text, time, unliftio-core, unordered-containers + , network-uri, split, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.2"; - sha256 = "0wpfcr3z3vpsy1m0zwrzszpsa4w4p9261ys8bnmvwg1qa8fpg278"; + version = "7.0.3"; + sha256 = "152w0zg2psdgii74k8h1wpq2qcnpmiybh0fa3y8i7fj75v8y0wj9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit - generic-lens lens lens-aeson monad-loops mtl network-uri text + generic-lens lens lens-aeson monad-loops mtl network-uri split text unliftio-core unordered-containers ]; testHaskellDepends = [ @@ -28872,7 +28895,6 @@ self: { 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; }) {}; "antiprimes" = callPackage @@ -29186,21 +29208,19 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, hspec, HTTP, http-client, http-client-tls, http-types - , text, tls, transformers + , QuickCheck, text, tls, transformers }: mkDerivation { pname = "api-builder"; - version = "0.15.0.0"; - sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad"; - revision = "1"; - editedCabalFile = "0sw6vdnzlqyv9n7gdhy1ibh7vrzfflc1cy2q558a4i23gn74k74s"; + version = "0.16.0.0"; + sha256 = "1va2h0sbmx15a29ffmnqqidwzj1kk6dbcgdlcx2lpfk3cwwnpj8m"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers ]; testHaskellDepends = [ - aeson base bytestring Cabal containers hspec http-client text - transformers + aeson base bytestring Cabal containers hspec http-client QuickCheck + text transformers ]; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -29688,23 +29708,11 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "appar"; - version = "0.1.7"; - sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn"; - libraryHaskellDepends = [ base bytestring ]; - description = "A simple applicative parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "appar_0_1_8" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "appar"; version = "0.1.8"; sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4"; libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appc" = callPackage @@ -31794,8 +31802,8 @@ self: { pname = "async"; version = "2.2.1"; sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; - revision = "1"; - editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31"; + revision = "2"; + editedCabalFile = "130rc6icx3h471qs417lkw9b2pfn27xd009liw58cmdk66zscizp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -32087,8 +32095,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.8.0"; - sha256 = "0vqwrzr9axhxc2mvbwv4qzk5jgf9wplh2ss1hkbaqc9zp7wb4j7f"; + version = "0.4.9.0"; + sha256 = "1wgfgdimfp2fnd630s8288dciip26ysl7p0lmvm321migm22idq9"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -32194,29 +32202,30 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, data-default - , filepath, lens-simple, parsers, pretty-simple - , quickcheck-instances, refined, resourcet, safe-exceptions, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep + ({ mkDerivation, base-noprelude, blaze-builder, conduit + , data-default, filepath, generic-random, lens-simple, parsers + , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances + , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.6.0.0"; - sha256 = "1j88cnilxmybjc981a4z4hgsdq94gv386hc1zlbrm8zklq2rpgx2"; + version = "0.7.0.0"; + sha256 = "1xl2p06s26zm65sn9a13bzcq30d5vggnq32s8f51ss86b4h431q2"; libraryHaskellDepends = [ - base blaze-builder conduit lens-simple parsers refined - safe-exceptions text time timerep uri-bytestring xml-conduit - xml-types + base-noprelude blaze-builder conduit lens-simple parsers + prettyprinter refined relude safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base blaze-builder conduit data-default filepath lens-simple - parsers pretty-simple quickcheck-instances refined resourcet - safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck + base-noprelude conduit data-default filepath generic-random + lens-simple pretty-simple QuickCheck quickcheck-instances refined + relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -32413,10 +32422,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.13"; - sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz"; - revision = "1"; - editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh"; + version = "3.2.5.16"; + sha256 = "044i1a6faw7r7ds910wk99mmg09ks1gdzc1md114nml614n3fqih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32982,15 +32989,15 @@ self: { }) {}; "aur" = callPackage - ({ mkDerivation, aeson, base, errors, http-client, http-client-tls - , servant, servant-client, tasty, tasty-hunit, text + ({ mkDerivation, aeson, base, http-client, http-client-tls, servant + , servant-client, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.1.0.1"; - sha256 = "02qr5jmp2i1dn1wx9nsflrp81gnx32yvsvmbzxany5ab78g52gsz"; + version = "6.2.0.1"; + sha256 = "00h5v3b4is5jc11x85cjzq25lsqrlhidibsyn847bl0cpn9292d2"; libraryHaskellDepends = [ - aeson base errors http-client servant servant-client text + aeson base http-client servant servant-client text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -34384,6 +34391,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axiom" = callPackage @@ -34607,6 +34616,8 @@ self: { ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "babl" = callPackage @@ -35879,6 +35890,23 @@ self: { broken = true; }) {}; + "bazel-coverage-report-renderer" = callPackage + ({ mkDerivation, base, cmdargs, directory, filepath, hxt, hxt-xpath + , listsafe, MissingH + }: + mkDerivation { + pname = "bazel-coverage-report-renderer"; + version = "0.1.0"; + sha256 = "19bin8hym1zqd85v7kbkk4jbpqs19yn4588q8x903i8m7863p83v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs directory filepath hxt hxt-xpath listsafe MissingH + ]; + description = "HTML Coverage Reports for Rules_Haskell"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bazel-runfiles" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -35906,18 +35934,25 @@ self: { }) {}; "bbi" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers, mtl - , zlib + ({ mkDerivation, base, bioinformatics-toolkit, bytestring, cereal + , conduit, containers, mtl, random, tasty, tasty-golden + , tasty-hunit, vector, zlib }: mkDerivation { pname = "bbi"; - version = "0.1.0"; - sha256 = "0y18lc7h5sljzvcbfa69n22p0l12a1rjymp4x24wlz25jbq9bm2g"; + version = "0.1.1"; + sha256 = "1m9rhng6kpqzsgmyr5ilq7brvx9jpkvqgqaixbdlx79ijxkw7dz3"; libraryHaskellDepends = [ base bytestring cereal conduit containers mtl zlib ]; + testHaskellDepends = [ + base bioinformatics-toolkit bytestring conduit mtl random tasty + tasty-golden tasty-hunit vector + ]; description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bcrypt" = callPackage @@ -36729,8 +36764,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.3"; - sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6"; + version = "0.2.0.4"; + sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv"; libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; @@ -37099,8 +37134,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; - revision = "1"; - editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; + revision = "2"; + editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -37125,6 +37160,8 @@ self: { pname = "binary"; version = "0.8.6.0"; sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y"; + revision = "1"; + editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -37296,6 +37333,33 @@ self: { broken = true; }) {}; + "binary-instances" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1"; + sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "binary-list" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , phantom-state, transformers @@ -37351,6 +37415,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_1_0_1" = callPackage + ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "binary-orphans"; + version = "1.0.1"; + sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; + libraryHaskellDepends = [ base binary transformers ]; + testHaskellDepends = [ + base binary QuickCheck quickcheck-instances tagged tasty + tasty-quickcheck + ]; + description = "Compatibility package for binary; provides instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl , quickcheck-instances, rerebase, tasty, tasty-hunit @@ -37547,10 +37629,8 @@ self: { }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.1"; - sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh"; - revision = "1"; - editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx"; + version = "0.1.5.2"; + sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable scientific SHA tagged text time @@ -37571,32 +37651,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary-tagged_0_1_5_2" = callPackage + "binary-tagged_0_2" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, generics-sop, hashable, nats, quickcheck-instances - , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck - , text, time, unordered-containers, vector + , binary, binary-instances, bytestring, containers, criterion + , cryptohash-sha1, deepseq, generics-sop, hashable, nats + , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.2"; - sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; + version = "0.2"; + sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - generics-sop hashable scientific SHA tagged text time + cryptohash-sha1 generics-sop hashable scientific tagged text time unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable quickcheck-instances - scientific SHA tagged tasty tasty-quickcheck text time - unordered-containers vector + aeson array base base16-bytestring bifunctors binary + binary-instances bytestring containers generics-sop hashable + quickcheck-instances scientific tagged tasty tasty-hunit + tasty-quickcheck text time unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector + aeson array base base16-bytestring binary binary-instances + bytestring containers criterion deepseq generics-sop hashable nats + scientific semigroups SHA tagged text time unordered-containers + vector ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; @@ -37644,6 +37726,17 @@ self: { broken = true; }) {}; + "binary-varint" = callPackage + ({ mkDerivation, base, binary }: + mkDerivation { + pname = "binary-varint"; + version = "0.1.0.0"; + sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8"; + libraryHaskellDepends = [ base binary ]; + description = "VarInt encoding/decoding via Data.Binary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binarydefer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38716,8 +38809,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.7.0"; - sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg"; + version = "0.8.0"; + sha256 = "0mkcxqnszkr9r8w2rqb79501wxfpgd2g17rn2lrjcqllmxdvkgwk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -38831,8 +38924,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.2.0"; - sha256 = "0xqx7y0nv80wywp6ybcb23z77plizfvv6rk04gkykcpfjna6ijai"; + version = "0.1.2.1"; + sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39916,8 +40009,8 @@ self: { }: mkDerivation { pname = "blas-comfort-array"; - version = "0.0.0.1"; - sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + version = "0.0.0.2"; + sha256 = "1n9w905ppb08w0d8xbxvgipr9fv1iapwq3ybvk0dbj009w341kd1"; libraryHaskellDepends = [ base blas-ffi comfort-array netlib-comfort-array netlib-ffi storable-complex transformers @@ -41386,6 +41479,8 @@ self: { pname = "both"; version = "0.1.1.0"; sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg"; + revision = "1"; + editedCabalFile = "0fi2lvxcdnj9bi683kl840xpyj12wxwxvqbi86a6qp4r8bq8442n"; libraryHaskellDepends = [ base semigroups zero ]; description = "Like Maybe, but with a different Monoid instance"; license = stdenv.lib.licenses.mit; @@ -41608,8 +41703,8 @@ self: { ({ mkDerivation, array, base, containers, parsec }: mkDerivation { pname = "brain-bleep"; - version = "0.1.0.1"; - sha256 = "18d9nfr9pykj5xb50m1gc024nw5h8i75facw2a1wz325jyzncg84"; + version = "0.1.0.2"; + sha256 = "08rb1b7m5lpgiwdy1gl3dkc2ymc6l8ifssj4q2rqp46b27nbwsgz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parsec ]; @@ -41711,8 +41806,8 @@ self: { }: mkDerivation { pname = "breve"; - version = "0.4.4.0"; - sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p"; + version = "0.4.5.1"; + sha256 = "1db93l3lb09rsb6yh3pkbfpyh736a9ki0q1x8s8rcp4dsy79b3va"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -41723,7 +41818,7 @@ self: { xdg-basedir ]; description = "a url shortener"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -43114,7 +43209,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bv-little_1_0_0" = callPackage + "bv-little_1_0_1" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -43122,8 +43217,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.0.0"; - sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms"; + version = "1.0.1"; + sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6"; libraryHaskellDepends = [ base deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -43252,6 +43347,8 @@ self: { pname = "bytes"; version = "0.15.5"; sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683"; + revision = "1"; + editedCabalFile = "0k05cszpxmdwgnbxhmlmmvsxkwlanvz8dn0p3f6bzs8qlv3kbhm7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43282,6 +43379,8 @@ self: { pname = "byteslice"; version = "0.1.0.0"; sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; + revision = "1"; + editedCabalFile = "191drdfs4frgg5pg7fa0qh5ikik9lnm6kbrj1bmmnmzr4s9vdklv"; libraryHaskellDepends = [ base primitive ]; description = "Slicing ByteArray and MutableByteArray"; license = stdenv.lib.licenses.bsd3; @@ -43634,29 +43733,6 @@ self: { }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.1"; - sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q"; - revision = "1"; - editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-strict-builder_0_4_5_2" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; version = "0.4.5.2"; sha256 = "14l5q4wgx3fpysindlapf2binhy6svsc904c8x052v095p6gn9c2"; libraryHaskellDepends = [ @@ -43669,7 +43745,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-substring" = callPackage @@ -43722,29 +43797,6 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.7.2"; - sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_3" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; version = "0.2.7.3"; sha256 = "0v78jwzmpipw4iyr0i9klxhcfxf98vljxz3had1xklslhzsabk16"; libraryHaskellDepends = [ @@ -43759,7 +43811,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -44210,8 +44261,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.9"; - sha256 = "1h7wp30gmggsrjgspsahn6b045njy6c23mhgkmhz6nn5s4wa1hak"; + version = "1.0.0.10"; + sha256 = "1iy7a7zmf3z539snj6rgg3qkcx8f8xwqvjry6wwagalr6z5smhmx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44467,8 +44518,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.8.1.2"; - sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil"; + version = "0.8.2.0"; + sha256 = "1j3h28w9sva1kj410irysl4lbwbar0nbddb9w5gv6jn82ca2dl93"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -45458,6 +45509,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -46186,8 +46239,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.2.0.0"; - sha256 = "0b026vbp9xkwfis5xr1z4svi5z5b4dpj5c3w28133fr4rl6cdpx4"; + version = "0.2.1.0"; + sha256 = "14mda2yvg0phpfhkacm5whh4hqcvyw14xiilx28ghc4rkf7al0fi"; libraryHaskellDepends = [ async base bytestring pretty-show prettyprinter rio teardown time uuid @@ -48707,17 +48760,18 @@ self: { "check-pvp" = callPackage ({ mkDerivation, base, Cabal, containers, explicit-exception - , filepath, haskell-src-exts, non-empty, transformers, utility-ht + , filepath, haskell-packages, haskell-src-exts, hse-cpp, non-empty + , tagged, transformers, utility-ht }: mkDerivation { pname = "check-pvp"; - version = "0.0.1"; - sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f"; + version = "0.0.3"; + sha256 = "1x7bzl7fb5h1d69ggqcg3dk0dnw75h4namjqhjh4izxf02zvic7m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers explicit-exception filepath haskell-src-exts - non-empty transformers utility-ht + base Cabal containers explicit-exception filepath haskell-packages + haskell-src-exts hse-cpp non-empty tagged transformers utility-ht ]; description = "Check whether module and package imports conform to the PVP"; license = stdenv.lib.licenses.bsd3; @@ -48849,7 +48903,7 @@ self: { }) {}; "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers + ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, extra, file-embed, haskeline, megaparsec, MonadRandom , mtl, o-clock, optparse-applicative, parallel, parser-combinators , prettyprinter, process, random, stm, text, time @@ -48857,23 +48911,23 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.0.0"; - sha256 = "18ni11hlcd4mkd6s0a22afiads83vhspxabchspnjyn9vm75spfg"; + version = "0.3.1.1"; + sha256 = "05jwz1nq5wiqdpnwn31wyc4gpryh9b4qzil4rkgx7vhavck2w1ap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers file-embed megaparsec + attoparsec base binary bytestring containers file-embed megaparsec MonadRandom o-clock parser-combinators prettyprinter process random stm text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base bytestring containers extra file-embed haskeline - megaparsec MonadRandom mtl o-clock optparse-applicative + attoparsec base binary bytestring containers extra file-embed + haskeline megaparsec MonadRandom mtl o-clock optparse-applicative parser-combinators prettyprinter process random stm text time unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring containers directory file-embed + attoparsec base binary bytestring containers directory file-embed megaparsec MonadRandom o-clock parallel parser-combinators prettyprinter process random stm text time unordered-containers vector @@ -49324,8 +49378,8 @@ self: { pname = "chronos"; version = "1.0.5"; sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; - revision = "2"; - editedCabalFile = "02szph6d6x1s866p0qzq0by68r4vpxcwmk1l3pfmpqrxl9c038yz"; + revision = "3"; + editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -52123,6 +52177,8 @@ self: { executableToolDepends = [ markdown-unlit ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log_0_3_0_0" = callPackage @@ -52135,8 +52191,8 @@ self: { pname = "co-log"; version = "0.3.0.0"; sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; - revision = "1"; - editedCabalFile = "0qf4icy6mrvkwc8kd4w3x47ckhqsx5d5zqpc6cd9qcv1r6pw2vhj"; + revision = "2"; + editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52152,6 +52208,7 @@ self: { description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-core" = callPackage @@ -52872,6 +52929,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colonnade_1_2_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, contravariant + , doctest, fast-logger, profunctors, QuickCheck, semigroupoids + , semigroups, text, vector + }: + mkDerivation { + pname = "colonnade"; + version = "1.2.0.2"; + sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; + libraryHaskellDepends = [ + base bytestring contravariant profunctors semigroups text vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids + ]; + description = "Generic types and functions for columnar encoding and decoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "color-counter" = callPackage ({ mkDerivation, aeson, base, cmdargs, colour, containers , data-default, directory, friday, friday-devil, split, v4l2 @@ -53343,21 +53420,27 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, containers, deepseq, guarded-allocation - , non-empty, primitive, QuickCheck, storable-record, transformers + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , guarded-allocation, non-empty, prelude-compat, primitive + , QuickCheck, semigroups, storable-record, tagged, transformers , utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.3.1"; - sha256 = "1lbfx35v8qzi2wacqg47v6hw4kx2rxs5xml8mwb1fyqqxbzbv7n7"; + version = "0.4"; + sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m"; libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty primitive - QuickCheck storable-record transformers utility-ht + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record tagged transformers + utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers QuickCheck tagged ]; - testHaskellDepends = [ base containers QuickCheck ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comfort-graph" = callPackage @@ -54864,6 +54947,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_10" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.10"; + sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55285,8 +55385,8 @@ self: { pname = "conduit-extra"; version = "1.2.3.2"; sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; - revision = "2"; - editedCabalFile = "0x77alx5h3v07ra0l0l5b36rx5qb3vg2f5k711yvin1q40vwvhqg"; + revision = "3"; + editedCabalFile = "0m68hvcmg4wwn12wcczqx1i60i8g2nv95c05abnl8ymq0377c7wi"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -55856,41 +55956,6 @@ self: { , case-insensitive, connection, data-default, deepseq, directory , dlist, enclosed-exceptions, filepath, http-client , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, semigroups, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; - version = "0.4.0"; - sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx"; - setupHaskellDepends = [ - base bytestring Cabal directory filepath process - ]; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors semigroups - text tls transformers unordered-containers x509 x509-system - x509-validation yaml - ]; - testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml - ]; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_4_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri , optparse-applicative, process, profunctors, semigroupoids , semigroups, text, tls, transformers, unordered-containers, wai , warp, warp-tls, x509, x509-system, x509-validation, yaml @@ -55918,7 +55983,6 @@ self: { ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -56422,8 +56486,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.2.0"; - sha256 = "0czsxil1mzswm9l88df4lnrgsgp634n06k14vs6f4zh2s9xxb59g"; + version = "1.0.3.0"; + sha256 = "0mx3r79sc86afpa0fnb8jhxk2g8cfr4hax7q5j8a8lfyxp1bcf3z"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56456,18 +56520,15 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, aeson, base, constraints, markdown-unlit - , template-haskell - }: + ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.5"; - sha256 = "1p45847w48waqvwmsvk44bvg39p2ifzdrwhk5h3n7l1avsmks37w"; + version = "0.3.0.1"; + sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; executableHaskellDepends = [ aeson base constraints ]; - executableToolDepends = [ markdown-unlit ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56546,8 +56607,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.0"; - sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; + version = "2.2.0.1"; + sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -56757,14 +56818,23 @@ self: { }) {}; "contiguous" = callPackage - ({ mkDerivation, base, deepseq, primitive }: + ({ mkDerivation, base, deepseq, primitive, primitive-unlifted + , QuickCheck, quickcheck-instances, vector + }: mkDerivation { pname = "contiguous"; - version = "0.3.3.0"; - sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; - libraryHaskellDepends = [ base deepseq primitive ]; + version = "0.4.0.1"; + sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn"; + libraryHaskellDepends = [ + base deepseq primitive primitive-unlifted + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-instances vector + ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -56776,6 +56846,8 @@ self: { libraryHaskellDepends = [ base contiguous primitive ]; description = "contiguous with bounds checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-fft" = callPackage @@ -56960,9 +57032,10 @@ self: { ({ mkDerivation, base, containers, stm, time }: mkDerivation { pname = "control-event"; - version = "1.2.1.1"; - sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565"; + version = "1.3"; + sha256 = "1a48h7nna7padcffdfyaavhfl43lqfhvib5ddsxbqm7y99nylni6"; libraryHaskellDepends = [ base containers stm time ]; + testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57437,8 +57510,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0.1"; - sha256 = "11vrin2d0zfqzn3c9ikn1ra76m2083nlrk3l8j4hk0pnssy9kjvp"; + version = "3.0.2"; + sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -57921,8 +57994,8 @@ self: { pname = "country"; version = "0.1.6"; sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9"; - revision = "2"; - editedCabalFile = "0721d9nc2snr6046ybmdj80xas7627lwd1ym6h1n8lclihw7ll6d"; + revision = "3"; + editedCabalFile = "034cd94hiwgci0qhkdkkqmx2igmf1wxmd4b70g6sdlk1kklcn7x1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq ghc-prim hashable primitive scientific text unordered-containers @@ -59844,8 +59917,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "3"; - editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g"; + revision = "4"; + editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -59939,6 +60012,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_26" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.26"; + sha256 = "1pdf0zzbfr0cdzls6bab6f6kpx08wa8c2qc1zfqzv5ajapgr0wy4"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -61821,6 +61917,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-accessor_0_2_3" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "data-accessor"; + version = "0.2.3"; + sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-accessor-monadLib" = callPackage ({ mkDerivation, base, data-accessor, monadLib }: mkDerivation { @@ -62043,6 +62151,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-combinator-gen" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "data-combinator-gen"; + version = "0.1.0.1"; + sha256 = "0z1x36y4d3i1pm33fjp3f0xdn9dqjbgfvd3b7yskznfjywn0jg42"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Generate a special combinator from any data type"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-compat" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -63582,6 +63701,35 @@ self: { broken = true; }) {}; + "datadog_0_2_4_0" = callPackage + ({ mkDerivation, aeson, auto-update, base, buffer-builder + , bytestring, Cabal, containers, dlist, exceptions, hspec + , http-client, http-client-tls, http-types, lens, lifted-base + , monad-control, network, old-locale, random, text, time + , transformers-base, unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "datadog"; + version = "0.2.4.0"; + sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4"; + libraryHaskellDepends = [ + aeson auto-update base buffer-builder bytestring containers dlist + http-client http-client-tls http-types lens lifted-base + monad-control network old-locale text time transformers-base + unliftio unordered-containers vector + ]; + testHaskellDepends = [ + aeson auto-update base buffer-builder bytestring Cabal containers + dlist exceptions hspec http-client http-client-tls http-types lens + lifted-base monad-control network old-locale random text time + transformers-base unliftio unordered-containers vector + ]; + description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "datadog-tracing" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , ffunctor, generic-random, hspec-golden-aeson, http-media @@ -64126,8 +64274,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.6"; - sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl"; + version = "1.2.7"; + sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -65223,6 +65371,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_10_1" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.10.1"; + sha256 = "15lwcc7i7wmi1gkkmak677qw0fnz4a4ldnv842xaimfi64753shv"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive transformers + unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -66309,6 +66480,8 @@ self: { ]; description = "JSON and CSV encoding for rationals as decimal point numbers"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "detour-via-uom" = callPackage @@ -66577,6 +66750,8 @@ self: { pname = "dhall"; version = "1.23.0"; sha256 = "074xpiag5csg08s9g9lcymi2mhvlwgjpqzmg7bw190mdpb8vk9zd"; + revision = "1"; + editedCabalFile = "06z5f1jk0s65dkvv5gmflla3j18vxwzgspg0lfql1vihxnvrk9hj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66786,19 +66961,19 @@ self: { "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant - , dhall, Diff, directory, filepath, hashable, microlens - , optparse-applicative, prettyprinter, tasty, tasty-golden - , tasty-hunit, text, transformers, vector + , dhall, Diff, directory, filepath, microlens, optparse-applicative + , prettyprinter, tasty, tasty-golden, tasty-hunit, text + , transformers, vector }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.3.2.0"; - sha256 = "1cy7pqqfrmli3a8p24j0dgksfwhj08kjpbp31bdibnr8ix204jjc"; + version = "1.3.3.0"; + sha256 = "0nh7sn8hzm38prx4c2h9azw351gns4mscjnn7dsgxpn34l5yyql7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers contravariant dhall filepath - hashable text transformers vector + base bytestring Cabal containers contravariant dhall filepath text + transformers vector ]; executableHaskellDepends = [ base bytestring Cabal dhall directory filepath microlens @@ -66810,8 +66985,6 @@ self: { ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -67948,6 +68121,8 @@ self: { pname = "digestive-functors"; version = "0.8.4.0"; sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; + revision = "2"; + editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -68664,6 +68839,17 @@ self: { broken = true; }) {}; + "discokitty" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "discokitty"; + version = "0.1.0"; + sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj"; + libraryHaskellDepends = [ base containers ]; + description = "DisCoCat implementation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "discord-gateway" = callPackage ({ mkDerivation, aeson, base, discord-types, hslogger, transformers , url, websockets, wuss @@ -69637,8 +69823,8 @@ self: { }: mkDerivation { pname = "distributed-static"; - version = "0.3.8"; - sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm"; + version = "0.3.9"; + sha256 = "1nch2k8dnlf6is2p4skh8vd0qbkgai4r6msfn6r5cr0cqaarb6pf"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -71791,8 +71977,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "4"; - editedCabalFile = "1ln3lwx4h7yi3gf5r4ix92nvjcjjhphiqan1lnci81wn0frs9wrz"; + revision = "5"; + editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72078,6 +72264,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dvault" = callPackage + ({ mkDerivation, base, bytestring, containers, crypto-rng + , data-default, directory, process, vector + }: + mkDerivation { + pname = "dvault"; + version = "0.1.0.0"; + sha256 = "1djk7c7zbkhr95nvrn4wf864yl425w0ifwgsb5f4al0gyv1cx0c9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers crypto-rng data-default directory + process vector + ]; + description = "Dead simple password manager"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dvda" = callPackage ({ mkDerivation, ad, base, containers, directory, fgl , file-location, graphviz, hashable, hashtables, mtl, process @@ -72410,10 +72616,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.3.0.0"; - sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; - revision = "1"; - editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da"; + version = "0.4.0.0"; + sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -72468,19 +72672,18 @@ self: { "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion - , exceptions, generics-sop, hashable, hspec, lens, monad-loops - , monad-supply, safe-exceptions, scientific, semigroups, tagged - , template-haskell, text, transformers, unordered-containers - , uuid-types, vector + , exceptions, generics-sop, hashable, hspec, lens, monad-loops, mtl + , safe-exceptions, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, uuid-types, vector }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.1"; - sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; + version = "0.6.0.2"; + sha256 = "1mx2ylbvcyskv0pc053mcwlz3mycqrq3g4rgrbk4qhnywx8p7gav"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop - hashable lens monad-loops monad-supply scientific semigroups tagged + hashable lens monad-loops mtl scientific semigroups tagged template-haskell text transformers unordered-containers uuid-types vector ]; @@ -73437,8 +73640,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.14"; - sha256 = "0iilizs6nj901fmzfam9s0s2phz91m2292wggqvzj8p6260589iq"; + version = "3.8.1"; + sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75909,15 +76112,17 @@ self: { }) {}; "error-codes" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "error-codes"; - version = "0.1.0.0"; - sha256 = "1i78vxk5ldasbn0fs8nwjfsjzkxjmg05i6vgzs4jlj1ajsgwhhkj"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.0.1"; + sha256 = "0df14g66vwz56bbiyjbis86cv106rlnniaf39kqzrnrdwswx1s1d"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-context" = callPackage @@ -76123,6 +76328,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_6" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.6"; + sha256 = "0h99i04690c7f1zpkzbh31p641nmxyj7grisxw5yaavdbinagmvq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -77095,6 +77328,8 @@ self: { pname = "eventful-sql-common"; version = "0.2.0"; sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + revision = "1"; + editedCabalFile = "1w2qq0p4304zsjkwmqx79azpq5v0ajz5grg740vwkca8qvdvdq91"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent persistent-template text uuid @@ -77298,6 +77533,43 @@ self: { broken = true; }) {}; + "eventstore_1_3_0" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, file-embed, hashable + , http-client, interpolate, lifted-async, lifted-base + , monad-control, monad-logger, mono-traversable, mtl, protobuf + , random, safe, safe-exceptions, semigroups, stm, stm-chans + , streaming, tasty, tasty-hspec, tasty-hunit, text, time + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "eventstore"; + version = "1.3.0"; + sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan ekg-core exceptions fast-logger + hashable http-client interpolate lifted-async lifted-base + monad-control monad-logger mono-traversable mtl protobuf random + safe safe-exceptions semigroups stm stm-chans streaming text time + transformers-base unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger file-embed hashable + lifted-async lifted-base monad-control mono-traversable protobuf + safe safe-exceptions semigroups stm stm-chans streaming tasty + tasty-hspec tasty-hunit text time transformers-base + unordered-containers uuid vector + ]; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -78161,6 +78433,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "explicit-exception_0_1_10" = callPackage + ({ mkDerivation, base, deepseq, semigroups, transformers }: + mkDerivation { + pname = "explicit-exception"; + version = "0.1.10"; + sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; + description = "Exceptions which are explicit in the type signature"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "explicit-iomodes" = callPackage ({ mkDerivation, base, base-unicode-symbols, tagged }: mkDerivation { @@ -78474,29 +78760,29 @@ self: { ({ mkDerivation, async, base, bytestring, containers, data-default , deepseq, directory, exceptions, extensible-effects, filepath , hostname, HUnit, lens, monad-control, mtl, network, parallel - , process, QuickCheck, safe-exceptions, stm, tasty, tasty-discover - , tasty-hunit, text, time, transformers-base + , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty + , tasty-discover, tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.22.1"; - sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z"; + version = "0.23.0"; + sha256 = "0lyhkpds8j8b6vb9sk4ibad8a36zanfdq59mg1kiasxx6wmy20v5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-default deepseq directory exceptions extensible-effects filepath hostname lens monad-control - mtl network parallel process QuickCheck safe-exceptions stm text - time transformers-base + mtl network parallel pretty-types process QuickCheck + safe-exceptions stm text time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath - lens text + lens pretty-types text ]; testHaskellDepends = [ async base containers data-default deepseq extensible-effects - filepath hostname HUnit lens QuickCheck stm tasty tasty-discover - tasty-hunit text time + filepath hostname HUnit lens pretty-types QuickCheck stm tasty + tasty-discover tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; @@ -78966,8 +79252,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.2.0"; - sha256 = "0297bppk69gn4sv5m5w1wh4wbshiz9w3b81sr9ps309k7bb6va9j"; + version = "0.2.1"; + sha256 = "11dsj2b1dyg6hdjhj3l7q04w896mrc32zkn1zkj2l032zlbwi44n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath random @@ -79459,15 +79745,17 @@ self: { }) {inherit (pkgs) openssl;}; "fastsum" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, template-haskell }: + ({ mkDerivation, base, deepseq, ghc-prim, hashable + , template-haskell + }: mkDerivation { pname = "fastsum"; - version = "0.1.0.0"; - sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57"; + version = "0.1.1.0"; + sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim hashable template-haskell + base deepseq ghc-prim hashable template-haskell ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = stdenv.lib.licenses.bsd3; @@ -80671,8 +80959,8 @@ self: { }: mkDerivation { pname = "ffunctor"; - version = "1.1.100"; - sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9"; + version = "1.2.0"; + sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -81337,6 +81625,8 @@ self: { pname = "fin"; version = "0.0.2"; sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i"; + revision = "1"; + editedCabalFile = "11jxsij60l69n79sws23sgvbal2kbw7w5yv2fbp5580f8swj95c4"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -82560,6 +82850,8 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flip-cmd" = callPackage @@ -82918,8 +83210,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.8.0.0"; - sha256 = "0gidczc4d3gi97w7ck3xp7q4amvnhkyzfpksyxc8r6cyfz29n9ic"; + version = "0.8.0.2"; + sha256 = "07q7xb7h48by6gj284fczszay4gg1r0j2nr7fmffj72nkjgzzyhx"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -83002,8 +83294,8 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.2.0.0"; - sha256 = "1hmyr5vnv7inkjnffadfjiwp9fwsw9jr0c45dcbk5gs9kwpa77zz"; + version = "0.2.0.2"; + sha256 = "07f21cr07kfzzrsk6j63livwjbi0ci43i5czbplj3wsy58sq8pn7"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -83397,8 +83689,8 @@ self: { pname = "foldl"; version = "1.4.5"; sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; - revision = "2"; - editedCabalFile = "080v2qwck5k9jfix55bv04h9m9ci14kgdrjbrssab2wgraxpyjvz"; + revision = "3"; + editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -85515,6 +85807,8 @@ self: { pname = "frpnow"; version = "0.18"; sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz"; + revision = "1"; + editedCabalFile = "0biplda0z6pmnm28vcdnaa4k82zcbhrghynqzsy7whs0kc86zq4a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Principled practical FRP"; @@ -86530,15 +86824,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_3_1_0" = callPackage + "fused-effects_0_4_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.3.1.0"; - sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv"; + version = "0.4.0.0"; + sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8"; libraryHaskellDepends = [ base deepseq MonadRandom random transformers unliftio-core ]; @@ -86552,12 +86846,16 @@ self: { }) {}; "fused-effects-exceptions" = callPackage - ({ mkDerivation, base, fused-effects, safe-exceptions }: + ({ mkDerivation, base, fused-effects, safe-exceptions + , unliftio-core + }: mkDerivation { pname = "fused-effects-exceptions"; - version = "0.1.0.0"; - sha256 = "0ga4cjlmrc577gps0mhy37n1np2ds0wcfnq3nbhvz3fy3m5fzylz"; - libraryHaskellDepends = [ base fused-effects safe-exceptions ]; + version = "0.1.1.0"; + sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd"; + libraryHaskellDepends = [ + base fused-effects safe-exceptions unliftio-core + ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88238,21 +88536,19 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.2.1"; - sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "6"; - editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw"; + version = "0.1.3"; + sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop-lens_0_1_3" = callPackage + "generics-sop-lens_0_2" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.3"; - sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; + version = "0.2"; + sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -88780,27 +89076,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.3"; - sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; - libraryHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec QuickCheck validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec genvalidity-property - hashable hspec hspec-core QuickCheck validity - ]; - description = "Standard spec's for Hashable instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-hashable_0_2_0_4" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec - , genvalidity-property, hashable, hspec, hspec-core, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-hashable"; version = "0.2.0.4"; sha256 = "1vyd14cmsj54kbfbidgsy8r695zza635bxwg2i95gl1i314dzy1n"; libraryHaskellDepends = [ @@ -88813,7 +89088,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -89707,8 +89981,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0.2"; - sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy"; + version = "0.9.0"; + sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89955,8 +90229,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190423"; - sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx"; + version = "0.20190523.1"; + sha256 = "12mb2s6l8vjda091j5ch99chvffhvbqc2vmrjjvls7wx94qaz3hi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89980,8 +90254,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190423"; - sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k"; + version = "0.20190523"; + sha256 = "0z023rimlifffds03h25r9m1s5c51wfwra0d0isfiijqfxmq3ki7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -90381,20 +90655,6 @@ self: { ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.3.1"; - sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_4_0" = callPackage - ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: - mkDerivation { - pname = "ghc-syntax-highlighter"; version = "0.0.4.0"; sha256 = "1kw1h7n4ydn1klzll24nwwg405j23wry9hg8g96vba51vah0wc47"; enableSeparateDataOutput = true; @@ -90403,7 +90663,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -91973,15 +92232,15 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , data-default, filepath, http-types, mtl, parsec, process - , regex-tdfa, safe, scientific, tasty, tasty-hunit + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers , utf8-string, vector, yaml }: mkDerivation { pname = "ginger"; - version = "0.8.4.0"; - sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7"; + version = "0.8.4.1"; + sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91991,8 +92250,8 @@ self: { unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson base bytestring data-default process text transformers - unordered-containers yaml + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml ]; testHaskellDepends = [ aeson base bytestring data-default mtl tasty tasty-hunit @@ -92001,6 +92260,8 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gingersnap" = callPackage @@ -92233,13 +92494,12 @@ self: { bup curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - installPhase = "make PREFIX=$out BUILDER=: install"; - checkPhase = '' + postBuild = '' ln -sf dist/build/git-annex/git-annex git-annex ln -sf git-annex git-annex-shell - export PATH+=":$PWD" - git-annex test ''; + installPhase = "make PREFIX=$out BUILDER=: install install-completions"; + checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; @@ -92473,6 +92733,39 @@ self: { broken = true; }) {}; + "git-remote-ipfs" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, conduit-extra, cryptonite, filepath, formatting + , generics-sop, git, http-client, ipfs-api, ipld-cid, lens + , lens-aeson, mtl, multibase, multihash-cryptonite, network-uri + , optparse-applicative, primitive, safe-exceptions, servant + , servant-client, stm, text, transformers, typed-process + , unordered-containers, vector + }: + mkDerivation { + pname = "git-remote-ipfs"; + version = "0.1.0.0"; + sha256 = "1zh7wbyd01p17c7lxx4xvj0rhnzqkpqcjdj1a3kynak2zi8wf6k2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit cryptonite filepath + formatting generics-sop git http-client ipfs-api ipld-cid lens + lens-aeson mtl multibase multihash-cryptonite network-uri + optparse-applicative primitive safe-exceptions servant + servant-client stm text transformers typed-process + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra mtl + optparse-applicative text + ]; + description = "Git remote helper to store git objects on IPFS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "git-repair" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-default, directory, exceptions, filepath, hslogger, IfElse @@ -93632,13 +93925,14 @@ self: { , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , regex-tdfa, semigroupoids, split, stm, template-haskell, text - , time, transformers, unix, unordered-containers, vector, vty + , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.30"; - sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; + version = "2.31"; + sha256 = "1div9xkls0jgsi3h0pm7y9rdlyr5rnc07ld3ka285g0hkg5yyban"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -93646,8 +93940,9 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues regex-tdfa semigroupoids split stm template-haskell text - time transformers unix unordered-containers vector vty + psqueues regex-tdfa regex-tdfa-text semigroupoids split stm + template-haskell text time transformers unix unordered-containers + vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -97035,8 +97330,8 @@ self: { }: mkDerivation { pname = "gopher-proxy"; - version = "0.1.1.1"; - sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd"; + version = "0.1.1.2"; + sha256 = "1ji7gfvcagvnv716ii6hwlv3g1np9iif7dk94mg42k265j30h4gh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98146,8 +98441,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.3"; - sha256 = "1v63hp99q3idyq5hmrcax45yp22cswvfs0jj4s7vs94s918a0xg4"; + version = "0.3.2.1"; + sha256 = "1853jmyh2lxgx4hhcgdlnrq4sdrqva0026whfdfa909gi51bg91w"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -101206,8 +101501,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "5"; - editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi"; + revision = "6"; + editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -102260,8 +102555,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 @@ -102430,8 +102723,8 @@ self: { }: mkDerivation { pname = "hakyll-dhall"; - version = "0.2.2.2"; - sha256 = "0w2vhma28904mg7bymk0qd3gzwirbjkjkw862jxg2zzcnsg8m04i"; + version = "0.2.3.0"; + sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102625,6 +102918,8 @@ self: { pname = "hakyll-shortcut-links"; version = "0.0.0.0"; sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; + revision = "1"; + editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p"; libraryHaskellDepends = [ base hakyll megaparsec mtl pandoc-types shortcut-links text ]; @@ -104085,25 +104380,6 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.9"; - sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; - revision = "3"; - editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_10" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; version = "1.19.10"; sha256 = "1vfaa8x6asmyabmd4i1ygyl2a8501h97xhkx3ip3jnqhjxn61sr2"; isLibrary = false; @@ -104113,7 +104389,6 @@ self: { testHaskellDepends = [ base process ]; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -104493,8 +104768,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.16"; - sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6"; + version = "0.0.0.17"; + sha256 = "1p7cwj9bm7wc39ra4vfwiv98f2zm1s9irmaf3kg64gdd2zi37d24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104982,11 +105257,29 @@ self: { pname = "hashtables"; version = "1.2.3.1"; sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg"; + revision = "1"; + editedCabalFile = "1yyqnqn85mlw03f2bpvwa1w9gigswk9n30i918myqyxwr595l7rr"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hashtables_1_2_3_2" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + mkDerivation { + pname = "hashtables"; + version = "1.2.3.2"; + sha256 = "0scwvwswx5wyqmwac09izf1yx01l13gx7334q6qjkjplarpbrwyi"; + revision = "1"; + editedCabalFile = "19d3739zphrp82wnn248ws18lknbh3dfpki87q0d2palxbnyh1hx"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -105651,18 +105944,19 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, monad-loops, process, text, unordered-containers + , haddock-api, haddock-library, monad-loops, process, text + , unordered-containers }: mkDerivation { pname = "haskell-docs"; - version = "4.2.8"; - sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz"; + version = "4.2.9"; + sha256 = "10pgziq2f9wx92afmwh1m4bwxcyygpf4xg99vghm6r4ilh1fbkg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api monad-loops process - text unordered-containers + directory filepath ghc ghc-paths haddock-api haddock-library + monad-loops process text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; @@ -106029,7 +106323,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_12_1_0" = callPackage + "haskell-lsp_0_13_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, filepath, hashable, haskell-lsp-types , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec @@ -106039,8 +106333,10 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.12.1.0"; - sha256 = "12h8vq2gr62mwf230m1z7hvi3mpv69lwhbvhp21wnk1r77mipd5k"; + version = "0.13.0.0"; + sha256 = "0mxmgw32j9fzr63qj1pviszcd2fb3mqdxnhz6ghv83lgj5j8517c"; + revision = "1"; + editedCabalFile = "0qni50rymq7qx95i6jcj3mb49zxc123ciyyih82vvm15gks62fp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106096,6 +106392,8 @@ self: { pname = "haskell-lsp-types"; version = "0.8.2.0"; sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; + revision = "1"; + editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -106104,15 +106402,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_12_1_0" = callPackage + "haskell-lsp-types_0_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.12.1.0"; - sha256 = "1657p73gyqhpb459qf349j0xx6icdj720x0v6x7nb6iyk63q6l6r"; + version = "0.13.0.0"; + sha256 = "18np1n5qvy5020vzvvcpj431fn4dbnd3zgzqngfnhv604yymywx8"; + revision = "2"; + editedCabalFile = "02yh8lkxbr7pzr97n5w2waz9cr1fisb8c0k16ajibhj57y3dn8il"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -107855,8 +108155,8 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.3.0.0"; - sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; + version = "0.3.0.1"; + sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -108191,8 +108491,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.7"; - sha256 = "0dn0d71jdpa4dmrwmpqipkdbl2cb8w8i2p18fly3b1xhpqra20il"; + version = "0.15.2"; + sha256 = "078w4a3xymp79dk17rprspm4c2m3p7qbcdqzmcgxjzz7kzsr5mmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109060,6 +109360,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_3_0_6" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.3.0.6"; + sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -111229,8 +111558,8 @@ self: { pname = "hedgehog"; version = "0.6.1"; sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "4"; - editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx"; + revision = "5"; + editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -111245,6 +111574,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0" = 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"; + sha256 = "1np9xg58x20kalfci9dxbd4wsg0sl3ka56ragzy3i9p0nx29pmns"; + revision = "1"; + editedCabalFile = "1b2hvd3z5mnwfdp5xwdwrh2f1l0wshnnz6ggak2dqqm57wyifdql"; + 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 @@ -111307,10 +111664,8 @@ self: { ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { pname = "hedgehog-fn"; - version = "0.6"; - sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv"; - revision = "1"; - editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1"; + version = "1.0"; + sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111318,6 +111673,8 @@ self: { ]; description = "Function generation for `hedgehog`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -111361,13 +111718,13 @@ self: { ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { pname = "hedgehog-quickcheck"; - version = "0.1"; - sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "3"; - editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3"; + version = "0.1.1"; + sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis" = callPackage @@ -111396,7 +111753,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_4" = callPackage + "hedis_0_12_5" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -111404,8 +111761,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.4"; - sha256 = "1d1r0ghf1fpiiarpywx7j48bhc86q86lass3b837dcyfni8z2sxw"; + version = "0.12.5"; + sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -111533,6 +111890,8 @@ self: { pname = "hedn"; version = "0.2.0.1"; sha256 = "16yi4x6g27zabgqwd4xckp5zibxq882919mmyyr95g56r7pm8v1j"; + revision = "1"; + editedCabalFile = "1wr3zv0bj1714y1ip40va34zysmypicd6qp0l50bg9wj2db0misz"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -113337,6 +113696,8 @@ self: { pname = "hgis"; version = "1.0.0.3"; sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8"; + revision = "1"; + editedCabalFile = "1p44ngzglxp8kdj6jlczgfjpms889r3fs7waz69zf50cbqq2am0c"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 @@ -113535,6 +113896,8 @@ self: { ]; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hi" = callPackage @@ -113864,8 +114227,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.1.0"; - sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542"; + version = "0.2.0.0"; + sha256 = "0q1xns7l7g1m4nfj4wr90r55m4n5c4fvigww12shr1x9hp30pqy0"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; testHaskellDepends = [ base doctest hspec lens QuickCheck ]; description = "Partial types as a type constructor"; @@ -114899,6 +115262,8 @@ self: { pname = "hit-on"; version = "0.0.0"; sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r"; + revision = "1"; + editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115080,21 +115445,26 @@ self: { }) {}; "hjugement-protocol" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite, hashable - , memory, mmorph, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, criterion, cryptonite, deepseq, memory, QuickCheck + , random, reflection, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190501"; - sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894"; + version = "0.0.0.20190519"; + sha256 = "163ihhjz3ma2x6hng7zssbcr9xfni7xn7imyg98w1qv68gbb3b7r"; libraryHaskellDepends = [ - base bytestring containers cryptonite memory mmorph random text - transformers unordered-containers + aeson base base64-bytestring binary bytestring containers + cryptonite deepseq memory random reflection text transformers + unordered-containers ]; testHaskellDepends = [ - base containers hashable QuickCheck random tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers + aeson base containers QuickCheck random tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion QuickCheck random text transformers ]; description = "A cryptographic protocol for the Majority Judgment"; license = stdenv.lib.licenses.gpl3; @@ -115329,8 +115699,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.12.0.0"; - sha256 = "0d57q99p1ph70mmwanlyps7vfj6iph9wmx0nza2jlg6falr7wrbj"; + version = "0.12.2.1"; + sha256 = "1vx74i1cqjmrrjq0mrdxmar6v221lir1zzkl8bn7iza4czkdarg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115624,22 +115994,22 @@ self: { "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml + , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour + , process, refact, text, transformers, uniplate + , unordered-containers, vector, yaml }: mkDerivation { pname = "hlint"; - version = "2.1.17"; - sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3"; + version = "2.1.21"; + sha256 = "1il8nrpk5iw6949dfchb2329z5xi7rx4zq028lmfqr8sg2hhjwj4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml + data-default directory extra filepath ghc-lib-parser + haskell-src-exts haskell-src-exts-util hscolour process refact text + transformers uniplate unordered-containers vector yaml ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; @@ -116333,19 +116703,17 @@ self: { }) {}; "hmm-lapack" = callPackage - ({ mkDerivation, base, boxes, comfort-array, containers, deepseq + ({ mkDerivation, base, comfort-array, containers, deepseq , explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi , non-empty, prelude-compat, QuickCheck, random, semigroups, tfp , transformers, utility-ht }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.3"; - sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk"; - revision = "1"; - editedCabalFile = "02m92qv8jg9xl489x177l9bnrz3nqxbcv4936xa4xhgmfgyfs7fg"; + version = "0.4"; + sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w"; libraryHaskellDepends = [ - base boxes comfort-array containers deepseq explicit-exception + base comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat QuickCheck random semigroups tfp transformers utility-ht ]; @@ -116710,8 +117078,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.5"; - sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz"; + version = "1.8.6"; + sha256 = "1m1www5i2wp49vb03zm0d0gaq0dlgdjafwjgp2zcc16gajpabami"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117556,28 +117924,30 @@ self: { }) {}; "hoogle" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit - , conduit-extra, connection, containers, deepseq, directory, extra - , filepath, foundation, hashable, haskell-src-exts, http-conduit - , http-types, js-flot, js-jquery, mmap, network-uri, old-locale - , process-extras, QuickCheck, resourcet, storable-tuple, tar - , template-haskell, text, time, transformers, uniplate, utf8-string - , vector, wai, wai-logger, warp, warp-tls, zlib + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, cmdargs, conduit, conduit-extra, connection + , containers, deepseq, directory, extra, filepath, foundation + , hashable, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network-uri, old-locale, process-extras + , QuickCheck, resourcet, storable-tuple, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.17.7"; - sha256 = "1nk255n7lwar9l70pz3z48c4fsp3a07gqhpci37iya1mw6kdnbbp"; + version = "5.0.17.8"; + sha256 = "0cdxxrq3c5jpkb469y7s571q8lbw7a2adq535cx0nsjldwxvjvlb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cmdargs conduit conduit-extra - connection containers deepseq directory extra filepath foundation - hashable haskell-src-exts http-conduit http-types js-flot js-jquery - mmap network-uri old-locale process-extras QuickCheck resourcet - storable-tuple tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib + aeson base binary blaze-html blaze-markup bytestring cmdargs + conduit conduit-extra connection containers deepseq directory extra + filepath foundation hashable haskell-src-exts http-conduit + http-types js-flot js-jquery mmap network-uri old-locale + process-extras QuickCheck resourcet storable-tuple tar + template-haskell text time transformers uniplate utf8-string vector + wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; @@ -117625,10 +117995,10 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.2.2"; - sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "4"; - editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; + version = "0.2.3"; + sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj"; + revision = "1"; + editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -118793,21 +119163,21 @@ self: { "hpqtypes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector + , directory, exceptions, filepath, HUnit, lifted-base + , monad-control, mtl, postgresql, QuickCheck, random, resource-pool + , scientific, semigroups, test-framework, test-framework-hunit + , text, text-show, time, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.6.1.0"; - sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn"; + version = "1.7.0.0"; + sha256 = "0vk6yj7rw3cqdvyfmpjis10av1apj79v0b8d9hagc8v8zzfp0wki"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - aeson async base bytestring containers data-default-class - exceptions lifted-base monad-control mtl resource-pool semigroups - text text-show time transformers transformers-base vector + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups text text-show time + transformers transformers-base vector ]; librarySystemDepends = [ postgresql ]; testHaskellDepends = [ @@ -118824,18 +119194,20 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, data-default, exceptions, fields-json, hpqtypes - , lifted-base, log-base, monad-control, mtl, safe, semigroups - , tasty, tasty-hunit, text, text-show, transformers + , cryptohash, exceptions, fields-json, hpqtypes, lifted-base + , log-base, monad-control, mtl, safe, semigroups, tasty + , tasty-hunit, text, text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.8.0.0"; - sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1"; + version = "1.9.0.0"; + sha256 = "04aibdf45w75f60wh77xk1n3a74mjqc1x4dlnxm5nx0vd8hypm2j"; + revision = "2"; + editedCabalFile = "132rdymxzkxrj8hwn7080k9xhawni3javx45rlzkr8cyv41qxwdl"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash - data-default exceptions fields-json hpqtypes lifted-base log-base - monad-control mtl safe semigroups text text-show + base base16-bytestring bytestring containers cryptohash exceptions + fields-json hpqtypes lifted-base log-base monad-control mtl safe + semigroups text text-show ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control tasty @@ -119200,30 +119572,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.6"; - sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx"; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring scientific stm text - unordered-containers vector - ]; - librarySystemDepends = [ ruby ]; - testHaskellDepends = [ - aeson attoparsec base QuickCheck text vector - ]; - description = "Embed a Ruby intepreter in your Haskell program !"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) ruby;}; - - "hruby_0_3_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , process, QuickCheck, ruby, scientific, stm, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hruby"; - version = "0.3.7"; - sha256 = "1i77gmkggm6l17zr1jrn65rjgh3m47f7wz5j9c715mi2ilr01qfx"; + version = "0.3.8"; + sha256 = "0x72gh0lzwrr10w7lply72yqz5q0hxq39virhm2sqqsmy9r305k8"; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text @@ -119235,7 +119585,6 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -119952,6 +120301,26 @@ self: { broken = true; }) {}; + "hs-zstd" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib + }: + mkDerivation { + pname = "hs-zstd"; + version = "0.1.1.1"; + sha256 = "1510r677j4vf9yrih3mimjrw31vgwcnw3wli41cddvghinm9paih"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs2048" = callPackage ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint , hspec, HUnit, process, QuickCheck, random, regex-compat @@ -121472,8 +121841,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.8"; - sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j"; + version = "0.10.0"; + sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121484,7 +121853,8 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; - description = "A command line program for extending the import list of a Haskell source file"; + doHaddock = false; + description = "Extend the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -121702,29 +122072,6 @@ self: { }: mkDerivation { pname = "hslua"; - version = "1.0.3"; - sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions fail mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; version = "1.0.3.1"; sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; @@ -121739,7 +122086,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -121751,6 +122097,8 @@ self: { pname = "hslua-aeson"; version = "1.0.0"; sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; + revision = "1"; + editedCabalFile = "1ysgh5s99zv0khkwqw1kcli2r2vi77r7wz3yc0y0i7qr35shzklh"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -122739,8 +123087,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.0.2"; - sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5"; + version = "1.0.1.0"; + sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -122888,8 +123236,8 @@ self: { pname = "hspec2"; version = "0.6.1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; - revision = "1"; - editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl"; + revision = "2"; + editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j"; libraryHaskellDepends = [ base hspec hspec-discover ]; description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; @@ -124865,22 +125213,6 @@ self: { "http-directory" = callPackage ({ mkDerivation, base, bytestring, html-conduit, http-client - , http-date, http-types, text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; - version = "0.1.1"; - sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-date http-types text - time xml-conduit - ]; - description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-directory_0_1_2" = callPackage - ({ mkDerivation, base, bytestring, html-conduit, http-client , http-client-tls, http-date, http-types, text, time, xml-conduit }: mkDerivation { @@ -124893,7 +125225,6 @@ self: { ]; description = "http directory listing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-dispatch" = callPackage @@ -125563,12 +125894,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "httpd-shed_0_4_1_0" = callPackage + "httpd-shed_0_4_1_1" = callPackage ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; - version = "0.4.1.0"; - sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y"; + version = "0.4.1.1"; + sha256 = "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; @@ -126389,6 +126720,31 @@ self: { broken = true; }) {}; + "hw-balancedparens_0_2_0_3" = callPackage + ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover + , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck + , vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.0.3"; + sha256 = "18hr2knvmy0jg0w5z73hsjnqcl3804chykr81wg82dx21snd6vmi"; + libraryHaskellDepends = [ + base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim @@ -126477,23 +126833,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; - version = "0.0.0.5"; - sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw"; - libraryHaskellDepends = [ base ]; - description = "Diagnostics library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-diagnostics_0_0_0_7" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hw-diagnostics"; version = "0.0.0.7"; sha256 = "1wfmrdpkvk2p045xchvwhnd1glq527ksgg0bs2qg5r0nyhsg55zi"; libraryHaskellDepends = [ base ]; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-dsv" = callPackage @@ -126507,6 +126851,8 @@ self: { pname = "hw-dsv"; version = "0.3.5"; sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2"; + revision = "1"; + editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126606,20 +126952,45 @@ self: { broken = true; }) {}; + "hw-excess_0_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.0.3"; + sha256 = "0g7izay5q8krg570jxkiwwrc0kw926q6hyx6bpg9a1qx9dlpy1bi"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector + ]; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit - , hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog }: mkDerivation { pname = "hw-fingertree"; - version = "0.1.0.1"; - sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + version = "0.1.0.3"; + sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 + base deepseq hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -126648,6 +127019,8 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.3"; sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2"; + revision = "1"; + editedCabalFile = "1wvjv13pznqxzhix7ikjx2gpqc3ppn7z20yl7l6z80yslalh7pm2"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; @@ -126676,6 +127049,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.7"; sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv"; + revision = "1"; + editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -127021,6 +127396,8 @@ self: { pname = "hw-prim"; version = "0.6.2.23"; sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy"; + revision = "1"; + editedCabalFile = "0pwgw9fqrfmfk3fjcdc9xss1vc6fl53pdnp8xcawia4mskd38sv7"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -127038,6 +127415,32 @@ self: { broken = true; }) {}; + "hw-prim_0_6_2_24" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.24"; + sha256 = "17bm69hva7cb6pf8qx4w027bckhgcci4mrqlfpf0vkbbzg3vm3wf"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers 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; + broken = true; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -127250,6 +127653,32 @@ self: { broken = true; }) {}; + "hw-uri" = callPackage + ({ mkDerivation, 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 + }: + mkDerivation { + pname = "hw-uri"; + version = "0.0.0.1"; + sha256 = "11cibgdyk4r1ad6hamb81ffcf27yar9w8045533f2sr6vfnhrj6m"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base + bytestring directory exceptions filepath http-client http-types + lens mtl resourcet text + ]; + testHaskellDepends = [ + antiope-core antiope-s3 base bytestring filepath hedgehog hspec + http-types hw-hspec-hedgehog lens text + ]; + testToolDepends = [ hspec-discover ]; + description = "CI Assistant for Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-vector" = callPackage ({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck , vector @@ -127916,6 +128345,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.2"; sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; + revision = "1"; + editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -128458,6 +128889,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "hyphenation_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , doctest, text, unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8"; + sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring containers text unordered-containers zlib + ]; + testHaskellDepends = [ + base containers doctest unordered-containers + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -128622,6 +129074,27 @@ self: { broken = true; }) {}; + "i3blocks-hs-contrib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, text + , time, transformers, turtle, wreq + }: + mkDerivation { + pname = "i3blocks-hs-contrib"; + version = "1.0.0"; + sha256 = "1lg60cgmyavlmn5a9ywa45vxskndqfbpy18vc6r6kxl49xgcqmpn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text turtle ]; + executableHaskellDepends = [ + aeson attoparsec base lens lens-aeson text time transformers turtle + wreq + ]; + description = "Base i3blocks written in haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "i3ipc" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec , network, text, typed-process, vector @@ -131239,6 +131712,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-cpp_0_3_0_2" = callPackage + ({ mkDerivation, base, hspec, inline-c, safe-exceptions + , template-haskell + }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.3.0.2"; + sha256 = "03dfikf43mmx4vzlp6nd6f1c3niklh2f9mq1s2fwsikh8x8x3qp6"; + libraryHaskellDepends = [ + base inline-c safe-exceptions template-haskell + ]; + testHaskellDepends = [ base hspec inline-c safe-exceptions ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-win32" = callPackage ({ mkDerivation, base, containers, inline-c, template-haskell , Win32 @@ -131912,8 +132402,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.39"; - sha256 = "0qfns2rwgkmd1i28p5pgvcp0yza8lrpi9xlq3zpl7jqrawbxbp3v"; + version = "0.1.40"; + sha256 = "09p5bjjqagbz1xkcfd5psmgxbg3z057kyv39j0i63g4q484zznz3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -132809,6 +133299,8 @@ self: { pname = "ip"; version = "1.5.0"; sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; + revision = "1"; + editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector wide-word @@ -132934,6 +133426,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipfs-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-media, http-types + , servant, text + }: + mkDerivation { + pname = "ipfs-api"; + version = "0.1.0.0"; + sha256 = "1fvvb36vfqpzbhsyp8ps0y9qpizj1b4xygiwxiqzf6g813yl53b8"; + libraryHaskellDepends = [ + aeson base bytestring http-media http-types servant text + ]; + description = "Auto-generated IPFS HTTP API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ipld-cid" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring + , cryptonite, deepseq, hashable, hedgehog, multibase + , multihash-cryptonite, text + }: + mkDerivation { + pname = "ipld-cid"; + version = "0.1.0.0"; + sha256 = "1y08j0ibcrpfcm0zv1h17zdgbl3hm3sjvm0w9bk1lzdipd6p6cwj"; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + multibase multihash-cryptonite text + ]; + testHaskellDepends = [ + base bytestring cryptonite hedgehog multibase multihash-cryptonite + text + ]; + description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ipopt-hs" = callPackage ({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers, ipopt , lens, mtl, nlopt, template-haskell, uu-parsinglib, vector @@ -133139,8 +133669,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.5"; - sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7"; + version = "1.1.0.6"; + sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -133169,8 +133699,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.1"; - sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; + version = "0.3.0.2"; + sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -133186,8 +133716,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.6.0"; - sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; + version = "2.7.0"; + sha256 = "1bsj4b8xwavc2z0amd2lmh4qn4gmxfmsicwdr1h3a2sqyx8qdv9m"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -133743,8 +134273,8 @@ self: { }: mkDerivation { pname = "itanium-abi"; - version = "0.1.1.0"; - sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8"; + version = "0.1.1.1"; + sha256 = "1dmr6sz4mf24781md81jjrwjsp431zyh7alkz71jlb224phc81nz"; libraryHaskellDepends = [ base boomerang text transformers unordered-containers ]; @@ -137184,36 +137714,6 @@ self: { }: mkDerivation { pname = "kanji"; - version = "3.4.0"; - sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr"; - revision = "2"; - editedCabalFile = "1bcc3kh6kndmkqi3vaxp27mg1qb7xbg1h8pgjc1kk1iawnhl930j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers deepseq hashable text - ]; - executableHaskellDepends = [ - aeson aeson-pretty base containers microlens microlens-aeson - optparse-applicative text transformers - ]; - testHaskellDepends = [ - aeson base containers HUnit-approx tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ aeson base containers criterion text ]; - description = "Perform æ¼¢å—検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "kanji_3_4_0_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion - , deepseq, hashable, HUnit-approx, microlens, microlens-aeson - , optparse-applicative, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "kanji"; version = "3.4.0.2"; sha256 = "017j8nwmwfbkxyaxjfp75js578kv6g5k7szsc46kidbw4l68dwmy"; isLibrary = true; @@ -138262,6 +138762,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kerry" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process + , resourcet, temporary-resourcet, text, transformers + , transformers-bifunctors + }: + mkDerivation { + pname = "kerry"; + version = "0.1.1"; + sha256 = "1b42mmwjvw39fyqi9b6gv67qpmswg6biabar55vggsxi8j43s76z"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers errors mmorph text + transformers transformers-bifunctors + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog hedgehog-corpus mmorph + mtl process resourcet temporary-resourcet text transformers + ]; + description = "Manage and abstract your packer configurations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -138859,26 +139383,27 @@ self: { "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive - , colonnade, containers, directory, Glob, here, http-client - , http-client-tls, http-types, hvega, logging-effect, lucid, mtl - , network, network-uri, pandoc, polysemy, prettyprinter, random - , random-fu, random-source, text, time + , colonnade, containers, diagrams-lib, diagrams-svg, directory + , Glob, here, http-client, http-client-tls, http-types, hvega + , logging-effect, lucid, mtl, network, network-uri, pandoc, plots + , polysemy, prettyprinter, random, random-fu, random-source + , svg-builder, text, time }: mkDerivation { pname = "knit-haskell"; - version = "0.2.0.0"; - sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv"; + version = "0.3.0.0"; + sha256 = "1mhxixiz07zlyhrdw68d2ajax40s01ikh27g56hlp1ilwnp8zqcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html - bytestring case-insensitive colonnade containers directory Glob - http-client http-client-tls http-types hvega logging-effect lucid - mtl network network-uri pandoc polysemy prettyprinter random - random-fu random-source text time + bytestring case-insensitive colonnade containers diagrams-lib + diagrams-svg directory Glob http-client http-client-tls http-types + hvega logging-effect lucid mtl network network-uri pandoc polysemy + prettyprinter random random-fu random-source svg-builder text time ]; executableHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl polysemy + base blaze-html colonnade containers here hvega mtl plots polysemy random-fu text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; @@ -140521,8 +141046,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.1.1"; - sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic"; + version = "0.1.2"; + sha256 = "0v0y50n2ks8jp91y37az6q46ax6dqx1igmlkb4b7c76qngak88xi"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -141536,24 +142061,20 @@ self: { }) {}; "lapack" = callPackage - ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms + ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, data-ref, deepseq, fixed-length - , guarded-allocation, lapack-ffi, lazyio, monoid-transformer + , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random - , semigroups, tfp, transformers, unique-logic-tf, utility-ht + , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2.4"; - sha256 = "16rgcxinkrkv1h35pfyrgg9xihkhpk3i2xd5f3xw29b1hahsb9hv"; - revision = "1"; - editedCabalFile = "0lcbih8i8rl6y9raxm77wfjb3lymivf3xicg1bslr6b5mrkyqqqh"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.1"; + sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g"; libraryHaskellDepends = [ - base blas-ffi boxes comfort-array deepseq fixed-length - guarded-allocation lapack-ffi lazyio netlib-ffi non-empty - semigroups tfp transformers utility-ht + base blas-ffi blaze-html boxes comfort-array deepseq fixed-length + guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty + semigroups text tfp transformers utility-ht ]; testHaskellDepends = [ base ChasingBottoms comfort-array data-ref monoid-transformer @@ -141588,14 +142109,16 @@ self: { }: mkDerivation { pname = "lapack-comfort-array"; - version = "0.0"; - sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + version = "0.0.0.1"; + sha256 = "0kn9bb3q772sbzm54rdqbqrmp21kck2gvc0xagi974dq7b1wilh1"; libraryHaskellDepends = [ base comfort-array lapack-ffi netlib-comfort-array netlib-ffi storable-complex transformers ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-ffi" = callPackage @@ -141861,8 +142384,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lattices_2" = callPackage @@ -141888,7 +142409,6 @@ self: { description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "launchpad-control" = callPackage @@ -142182,6 +142702,25 @@ self: { broken = true; }) {}; + "lazyboy" = callPackage + ({ mkDerivation, aeson, base, hspec, microstache, text + , transformers + }: + mkDerivation { + pname = "lazyboy"; + version = "0.2.0.1"; + sha256 = "1f5r0dpwf4x3zp9ii03pqw1j9iy0cyrrl6a9pfnmximzw753dhkp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + testHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + description = "An EDSL for programming the Game Boy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazyio" = callPackage ({ mkDerivation, base, transformers, unsafe }: mkDerivation { @@ -142407,6 +142946,23 @@ self: { broken = true; }) {}; + "lean" = callPackage + ({ mkDerivation, base, base-unicode-symbols, text-utf8 + , transformers, util + }: + mkDerivation { + pname = "lean"; + version = "0.0.0.1"; + sha256 = "1i1xkaipjaczp32hn5g5g4x9a3ml98hamb4qaycy7rlcfbildiga"; + libraryHaskellDepends = [ + base base-unicode-symbols text-utf8 transformers util + ]; + description = "Bonds to Lean theorem prover"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "leancheck" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -143221,8 +143777,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.2.2.0"; - sha256 = "0xm3nvh5irw3nw4cn94xh8i6z63mgkiymgf99yh582rbf047dfms"; + version = "1.2.3.0"; + sha256 = "07q7s710mcsbf51cwx68ps616nlsddll5k4cq6sn81bdd2n72fbx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143576,8 +144132,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "1.0.5.0"; - sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r"; + version = "1.0.5.1"; + sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -144204,6 +144760,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "librdkafka" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "librdkafka"; + version = "0.0.0.0"; + sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "libretls" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls , monad-ste, primitive, transformers, vector @@ -144316,8 +144883,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.3"; - sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq"; + version = "1.4.4"; + sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -145109,8 +145676,8 @@ self: { }: mkDerivation { pname = "linear-circuit"; - version = "0.1"; - sha256 = "0rvmnk8fwyns645rs8s0nwyfcyk2nc0z8jk03raasrk4kv3f26z3"; + version = "0.1.0.1"; + sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -147395,8 +147962,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.1"; - sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; + version = "0.10.1.0"; + sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -147416,10 +147983,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.0.2"; - sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; - revision = "1"; - editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; + version = "0.7.1.1"; + sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -147602,8 +148167,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.3"; - sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr"; + version = "1.3.4"; + sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -148201,6 +148766,23 @@ self: { broken = true; }) {}; + "looper" = callPackage + ({ mkDerivation, aeson, base, hspec, optparse-applicative, text + , time, unliftio + }: + mkDerivation { + pname = "looper"; + version = "0.0.0.2"; + sha256 = "0w4aancb0lbfgmk2drnbc1w6bxlbdkhg0zy1qj7xp3kvgc76vqli"; + libraryHaskellDepends = [ + aeson base optparse-applicative text time unliftio + ]; + testHaskellDepends = [ + aeson base hspec optparse-applicative text time unliftio + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "loops" = callPackage ({ mkDerivation, base, criterion, primitive, tasty , tasty-quickcheck, transformers, vector @@ -148525,7 +149107,7 @@ self: { broken = true; }) {}; - "lsp-test_0_5_2_2" = callPackage + "lsp-test_0_5_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -148534,8 +149116,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.2.2"; - sha256 = "0hld5xmv781nm0ix1mngjgch11bany0px923bgngp0nf6jgfz5yc"; + version = "0.5.2.3"; + sha256 = "1l4fdmqm6mvjpyz8imnf5q52pcls0jg5fqsxhkmj7ywnam66xfrk"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -148620,6 +149202,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -149758,8 +150342,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.2.1"; - sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx"; + version = "0.3.2"; + sha256 = "1fn9z92ckyq1zl7n83v8qcaawmgy4zbjjwihhy117m7nh4cl38hk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -150780,8 +151364,8 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.0"; - sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc"; + version = "0.1.0.1"; + sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151057,6 +151641,23 @@ self: { license = "GPL"; }) {}; + "markov-chain-usage-model" = callPackage + ({ mkDerivation, base, doctest, matrix, tasty, tasty-discover + , tasty-hunit, vector + }: + mkDerivation { + pname = "markov-chain-usage-model"; + version = "0.0.0"; + sha256 = "14r73bvh6w7qz7rqb97ky2iyf2z2j7y14iy4fcr8mjyxag3mk3jc"; + libraryHaskellDepends = [ base matrix vector ]; + testHaskellDepends = [ + base doctest matrix tasty tasty-discover tasty-hunit vector + ]; + testToolDepends = [ tasty-discover ]; + description = "Computations for Markov chain usage models"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "markov-processes" = callPackage ({ mkDerivation, assertions, base, bifunctors, memoize, MonadRandom , random @@ -153231,8 +153832,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "2"; - editedCabalFile = "02sbbiznppvdmpb373xyh8i84sywlzzvhhx5nd9ix5lmx50813qw"; + revision = "3"; + editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153875,29 +154476,6 @@ self: { }: mkDerivation { pname = "microlens-aeson"; - version = "2.3.0.1"; - sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs"; - revision = "1"; - editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable microlens - scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hashable microlens tasty tasty-hunit - text unordered-containers vector - ]; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - }) {}; - - "microlens-aeson_2_3_0_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , hashable, microlens, scientific, tasty, tasty-hunit, text - , unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; version = "2.3.0.4"; sha256 = "0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw"; libraryHaskellDepends = [ @@ -153910,7 +154488,6 @@ self: { ]; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -154781,36 +155358,36 @@ self: { broken = true; }) {}; - "minio-hs_1_3_0" = callPackage + "minio-hs_1_3_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, digest, directory, exceptions, filepath - , http-client, http-conduit, http-types, ini, memory, protolude - , QuickCheck, raw-strings-qq, resourcet, retry, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , xml-conduit + , case-insensitive, conduit, conduit-extra, connection, containers + , cryptonite, cryptonite-conduit, digest, directory, exceptions + , filepath, http-client, http-client-tls, http-conduit, http-types + , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet + , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , unordered-containers, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "1.3.0"; - sha256 = "1caia9dyxirxl7qy7ijhk1s4hp56m0f901ik34nbf5aizhl0qx94"; + version = "1.3.1"; + sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude raw-strings-qq resourcet retry text - time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + raw-strings-qq resourcet retry text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; testHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude QuickCheck raw-strings-qq resourcet - retry tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary - text time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit + tasty-quickcheck tasty-smallcheck temporary text time transformers + unliftio unliftio-core unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = stdenv.lib.licenses.asl20; @@ -155718,6 +156295,8 @@ self: { pname = "model"; version = "0.4.4"; sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; + revision = "1"; + editedCabalFile = "1av9z75w5cb4kh9fdr7cjp6gs9mwwbp47yi9gw1swz19yf7i1am4"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; @@ -158805,6 +159384,29 @@ self: { broken = true; }) {}; + "ms-tds" = callPackage + ({ mkDerivation, array, base, binary, bytestring + , data-default-class, mtl, network, text, time, tls, uuid-types + , x509-store, x509-system + }: + mkDerivation { + pname = "ms-tds"; + version = "0.1.0.0"; + sha256 = "05g5y0c105p1dqcd8mybqnrky495nb0320yrjgk7dr7lhfwsyb6s"; + revision = "1"; + editedCabalFile = "1n29v4kj4lmfvj15878l6949wjpl9h7mgrwj0i684hcqv7xlgml2"; + libraryHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + testHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + description = "TDS Protocol implemented in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty @@ -158925,6 +159527,24 @@ self: { broken = true; }) {}; + "mssql-simple" = callPackage + ({ mkDerivation, base, binary, bytestring, hostname, ms-tds + , network, text, time, tls + }: + mkDerivation { + pname = "mssql-simple"; + version = "0.1.0.2"; + sha256 = "0k0ijffl4xq5jb12gnwpnpc4r6cd64r1a344mqwybqaymjyblm66"; + libraryHaskellDepends = [ + base binary bytestring hostname ms-tds network text time tls + ]; + testHaskellDepends = [ + base binary bytestring hostname ms-tds network text time tls + ]; + description = "SQL Server client library implemented in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mstate" = callPackage ({ mkDerivation, base, fail, monad-peel, mtl, stm }: mkDerivation { @@ -159412,14 +160032,38 @@ self: { broken = true; }) {}; + "multibase" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring + , base32-z-bytestring, base58-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, deepseq, doctest, formatting + , hashable, QuickCheck, sandi, serialise, tagged, template-haskell + , text + }: + mkDerivation { + pname = "multibase"; + version = "0.1.0.0"; + sha256 = "1gvbqq4kd94n7dmcbjb3k24z0qrv13qmi8lhs3yxwch3y13qv60m"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base16-bytestring base32-z-bytestring base58-bytestring + base64-bytestring bytestring deepseq formatting hashable sandi + serialise tagged text + ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative , pretty, process, transformers }: mkDerivation { pname = "multifile"; - version = "0.1.0.6"; - sha256 = "054nh8g4ngg1d4ik41iagp72qdp8p6nbvr2kjrzk9a30a0k4akar"; + version = "0.1.0.7"; + sha256 = "0nc19swda1v8fz3fhd2vkkr6a4nd7519qkgpcbhpm2hplkan6csn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159484,6 +160128,44 @@ self: { broken = true; }) {}; + "multihash-cryptonite" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring, Cabal + , cabal-doctest, cryptonite, deepseq, doctest, hashable, hedgehog + , memory + }: + mkDerivation { + pname = "multihash-cryptonite"; + version = "0.1.0.0"; + sha256 = "0gl13kjqz14lnwz7x162fad3j99qs1xa3zabpr30q53pkzk8adsi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + memory + ]; + testHaskellDepends = [ base cryptonite doctest hedgehog ]; + description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multihash-serialise" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hedgehog, memory + , multibase, multihash-cryptonite, serialise + }: + mkDerivation { + pname = "multihash-serialise"; + version = "0.1.0.0"; + sha256 = "1bvh0fm26nnbfykimp3j2934lxwh7kgk6jkk9v8yjpn0k9rxnkrb"; + libraryHaskellDepends = [ + base bytestring cryptonite memory multibase multihash-cryptonite + serialise + ]; + testHaskellDepends = [ base cryptonite hedgehog serialise ]; + description = "CBOR encoding of multihashes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "multihashmap" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -161765,8 +162447,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; - revision = "2"; - editedCabalFile = "1654j2zngjzp71hra6s980hd9xgx0xlk6rvqm504n7h9vmyycrjx"; + revision = "3"; + editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; doHaddock = false; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -162586,13 +163268,15 @@ self: { ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: mkDerivation { pname = "netlib-comfort-array"; - version = "0.0"; - sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + version = "0.0.0.1"; + sha256 = "0v4p1l8gjqkxncjrp6bv664x6xs3y6n5h76pvgccsja5rammwbp3"; libraryHaskellDepends = [ base comfort-array netlib-ffi transformers ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netlib-ffi" = callPackage @@ -163378,6 +164062,8 @@ self: { pname = "network-info"; version = "0.2.0.10"; sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; + revision = "1"; + editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d"; libraryHaskellDepends = [ base ]; description = "Access the local computer's basic network configuration"; license = stdenv.lib.licenses.bsd3; @@ -163788,8 +164474,8 @@ self: { }: mkDerivation { pname = "network-transport"; - version = "0.5.2"; - sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7"; + version = "0.5.4"; + sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -164286,25 +164972,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "newtype"; - version = "0.2"; - sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; - revision = "1"; - editedCabalFile = "0rbhpa1krcmvv4hsy3h5h8l4vqjk9wckddcz34rfcq0m7zlmsrfz"; - libraryHaskellDepends = [ base ]; - description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype_0_2_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "newtype"; version = "0.2.1.0"; sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-deriving" = callPackage @@ -165306,6 +165978,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_2" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.2"; + sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + testHaskellDepends = [ base containers QuickCheck utility-ht ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -165422,6 +166110,29 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "nonempty-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, comonad, containers, data-or, deepseq + , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.2.0.0"; + sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw"; + libraryHaskellDepends = [ + base comonad containers data-or deepseq semigroupoids + ]; + testHaskellDepends = [ + base comonad containers data-or hedgehog hedgehog-fn semigroupoids + tasty tasty-hedgehog text + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nonemptymap" = callPackage @@ -165807,8 +166518,8 @@ self: { }: mkDerivation { pname = "nsis"; - version = "0.3.2"; - sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r"; + version = "0.3.3"; + sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx"; libraryHaskellDepends = [ base transformers uniplate ]; testHaskellDepends = [ base directory process transformers uniplate @@ -166275,8 +166986,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.2.3.1"; - sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k"; + version = "0.3.0.0"; + sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; @@ -166286,19 +166997,20 @@ self: { "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, numhask-prelude, protolude, QuickCheck - , singletons, tasty, tasty-quickcheck, vector + , distributive, doctest, hedgehog, numhask-hedgehog + , numhask-prelude, protolude, singletons, vector }: mkDerivation { pname = "numhask-array"; - version = "0.2.1.0"; - sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h"; + version = "0.3"; + sha256 = "0rx24k34asmkbwsqf0i5gbcc4av4r6pnxpgfw3dxhkgha72a4g9i"; libraryHaskellDepends = [ adjunctions base deepseq dimensions distributive numhask-prelude - protolude QuickCheck singletons vector + protolude singletons vector ]; testHaskellDepends = [ - base doctest numhask-prelude tasty tasty-quickcheck + adjunctions base dimensions doctest hedgehog numhask-hedgehog + numhask-prelude ]; description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -166306,6 +167018,24 @@ self: { broken = true; }) {}; + "numhask-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, numhask, numhask-prelude + , numhask-space + }: + mkDerivation { + pname = "numhask-hedgehog"; + version = "0.3"; + sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds"; + libraryHaskellDepends = [ + base hedgehog numhask numhask-prelude numhask-space + ]; + testHaskellDepends = [ base hedgehog numhask numhask-prelude ]; + description = "Laws and tests for numhask"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "numhask-histogram" = callPackage ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude , numhask-range, tdigest @@ -166325,12 +167055,13 @@ self: { }) {}; "numhask-prelude" = callPackage - ({ mkDerivation, base, doctest, numhask, protolude }: + ({ mkDerivation, base, doctest, numhask, numhask-space, protolude + }: mkDerivation { pname = "numhask-prelude"; - version = "0.1.0.1"; - sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi"; - libraryHaskellDepends = [ base numhask protolude ]; + version = "0.3.1"; + sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq"; + libraryHaskellDepends = [ base numhask numhask-space protolude ]; testHaskellDepends = [ doctest ]; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; @@ -166360,6 +167091,23 @@ self: { broken = true; }) {}; + "numhask-space" = callPackage + ({ mkDerivation, adjunctions, base, distributive, numhask + , semigroupoids + }: + mkDerivation { + pname = "numhask-space"; + version = "0.1.1"; + sha256 = "1rf86fbyrbs2a1dxrbr35a2dhfimclindlb4iimijs28is0zdz8s"; + libraryHaskellDepends = [ + adjunctions base distributive numhask semigroupoids + ]; + description = "numerical spaces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "numhask-test" = callPackage ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty , tasty-quickcheck @@ -169008,6 +169756,8 @@ self: { pname = "optional-args"; version = "1.0.2"; sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f"; + revision = "1"; + editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; @@ -170533,8 +171283,8 @@ self: { pname = "pandoc-citeproc"; version = "0.16.2"; sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv"; - revision = "1"; - editedCabalFile = "06g80bigzlnh5s569s2f1f0ds49cbsh0l69n3phr281x597x021j"; + revision = "2"; + editedCabalFile = "0z7ia0f89lamrvnr75j7r6jhklkly0qcyplws9ww9rpbj9j7shyk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170829,7 +171579,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_1_0" = callPackage + "pandoc-pyplot_2_1_1_1" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations , open-browser, pandoc, pandoc-types, tasty, tasty-hspec @@ -170838,8 +171588,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.1.0"; - sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx"; + version = "2.1.1.1"; + sha256 = "0m066z26z0w3jq96f4i8r45r1iwzy2wp8hzjq179z6jip4pjfh2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172173,23 +172923,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.0.2"; - sha256 = "1wb6xbx3p9fyisza9d7svnby4makv2bkp0yh7lfi2bg3kybg41ry"; - libraryHaskellDepends = [ base ]; - description = "Lightweight package providing commonly useful parser combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parser-combinators_1_0_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "parser-combinators"; version = "1.0.3"; sha256 = "0cqic88xwi60x5x6pli0r8401yljvg2cis8a67766zypfg0il3bp"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parser-combinators-tests" = callPackage @@ -172457,8 +173195,8 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.0"; - sha256 = "15rg80dgawmjz0gzfsspbb0b1045l6w5vvhwd4dgr7vv4hwj9gs9"; + version = "0.5.1.1"; + sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; @@ -172469,8 +173207,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.0"; - sha256 = "1qd9bg9qv0n80asfkrycvqwv92cdyy590871ypgkl82kx8x7qgbf"; + version = "0.6.0.1"; + sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = stdenv.lib.licenses.asl20; @@ -173342,6 +174080,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcg-random_0_1_3_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , entropy, primitive, random + }: + mkDerivation { + pname = "pcg-random"; + version = "0.1.3.6"; + sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring entropy primitive random + ]; + testHaskellDepends = [ base doctest ]; + description = "Haskell bindings to the PCG random number generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pcgen" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck , random @@ -175148,38 +175904,23 @@ self: { }) {}; "persistent-test" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base - , base64-bytestring, blaze-builder, blaze-html, blaze-markup - , bytestring, cereal, conduit, containers, exceptions, fast-logger - , hashable, hspec, hspec-expectations, http-api-data, HUnit - , lifted-base, monad-logger, mtl, network, old-locale, path-pieces - , persistent, persistent-sqlite, persistent-template, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , scientific, semigroups, silently, system-fileio, system-filepath - , tagged, template-haskell, text, time, transformers - , transformers-base, unliftio, unliftio-core, unordered-containers - , vector + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.0.0.3"; - sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3"; - isLibrary = true; - isExecutable = true; + version = "2.0.3.0"; + sha256 = "1bspcv64qhcqiam964kxfxlc9afbns41dffh00k36dl2akr7p99a"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base64-bytestring blaze-builder - blaze-html blaze-markup bytestring cereal conduit containers - exceptions fast-logger hashable hspec hspec-expectations - http-api-data HUnit lifted-base monad-logger mtl network old-locale - path-pieces persistent persistent-sqlite persistent-template - QuickCheck quickcheck-instances random resource-pool resourcet - scientific semigroups silently tagged template-haskell text time - transformers transformers-base unliftio unliftio-core - unordered-containers vector - ]; - executableHaskellDepends = [ - base hspec persistent resourcet scientific system-fileio - system-filepath + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; @@ -175558,8 +176299,8 @@ self: { }: mkDerivation { pname = "pgp-wordlist"; - version = "0.1.0.2"; - sha256 = "0ri4m4a18kmnpw2a3vcw7zgjagccqr3snw2qgljg3b92abl6z2z2"; + version = "0.1.0.3"; + sha256 = "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg"; libraryHaskellDepends = [ base bytestring containers text vector ]; testHaskellDepends = [ base bytestring deepseq doctest HUnit tasty tasty-hunit @@ -178351,10 +179092,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.0.2"; - sha256 = "0kdn2s686rfanqq4qfkbjfys53zzf2hgc2jx3m9zpfzjb3wabhg5"; - revision = "1"; - editedCabalFile = "1n3qzplpis1h90kw4x8fi4d8qhqy1xxxflv1d38516ikffwvai9x"; + version = "0.1.1.0"; + sha256 = "0hhmxwz18d2wdj2xnf9mn51ibym5dxc1gmji87cdccdf6a4wcxpa"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -178698,8 +179437,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.12"; - sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as"; + version = "1.1.1.13"; + sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178722,8 +179461,8 @@ self: { pname = "pointful"; version = "1.0.11.0"; sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; - revision = "1"; - editedCabalFile = "1a7fc03c586w011amjq770ifvf7ajbp9x3xp2w2yz1da9rkga2qv"; + revision = "2"; + editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179112,8 +179851,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "0.1.2.0"; - sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm"; + version = "0.2.0.0"; + sha256 = "0bcqvvcpfcgx6ckz0ry942z92nvhwqva9gz4bznr9fc26i0amsjw"; libraryHaskellDepends = [ base mtl random syb template-haskell transformers ]; @@ -179130,14 +179869,20 @@ self: { }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }: + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec + , inspection-testing, polysemy, should-not-typecheck, syb + , transformers + }: mkDerivation { pname = "polysemy-plugin"; - version = "0.1.0.0"; - sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr"; - libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ]; + version = "0.2.0.0"; + sha256 = "1qzhza8p462cm5brxyh2kv7yr39b2756h4h6yfls41smrfa7h05z"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra polysemy syb transformers + ]; testHaskellDepends = [ - base ghc ghc-tcplugins-extra hspec polysemy + base ghc ghc-tcplugins-extra hspec inspection-testing polysemy + should-not-typecheck syb transformers ]; description = "Disambiguate obvious uses of effects"; license = stdenv.lib.licenses.bsd3; @@ -179148,8 +179893,8 @@ self: { }: mkDerivation { pname = "polysemy-zoo"; - version = "0.1.0.0"; - sha256 = "0hiwv4fnila9ql3wxyni84z1209w7cd088gllw9n903qa41ncsqj"; + version = "0.1.1.0"; + sha256 = "1ivabmyhbajwsykq9dbx3mhybki2cnpl74cx7pcfb5i7c99qmk23"; libraryHaskellDepends = [ base containers polysemy polysemy-plugin ]; @@ -181340,6 +182085,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prelude-compat_0_0_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "prelude-compat"; + version = "0.0.0.2"; + sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1"; + libraryHaskellDepends = [ base ]; + description = "Provide Prelude and Data.List with fixed content across GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prelude-edsl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181757,19 +182514,6 @@ self: { }) {}; "pretty-sop" = callPackage - ({ mkDerivation, base, generics-sop, pretty-show }: - mkDerivation { - pname = "pretty-sop"; - version = "0.2.0.2"; - sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; - revision = "2"; - editedCabalFile = "04hzf2ajlnh3ynk72xr5s396v8y0d8fkr4pf11nqss7yf60dkxwi"; - libraryHaskellDepends = [ base generics-sop pretty-show ]; - description = "A generic pretty-printer using generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-sop_0_2_0_3" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { pname = "pretty-sop"; @@ -181780,7 +182524,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-terminal" = callPackage @@ -181881,6 +182624,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_3_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, criterion, deepseq, doctest, mtl, pgp-wordlist + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.3.0"; + sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers criterion deepseq mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -182127,16 +182896,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "primitive-atomic" = callPackage + "primitive_0_7_0_0" = callPackage + ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.0.0"; + sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck semigroups tagged tasty + tasty-quickcheck transformers transformers-compat + ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { - pname = "primitive-atomic"; + pname = "primitive-addr"; version = "0.1.0.0"; - sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv"; + sha256 = "0nm6l9gy57l1hli7zjlh2mfdzhwi602dnicxis1d8ylqqyv633gw"; libraryHaskellDepends = [ base primitive ]; - testHaskellDepends = [ base primitive ]; + description = "Addresses to unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "primitive-atomic" = callPackage + ({ mkDerivation, base, primitive, primitive-unlifted }: + mkDerivation { + pname = "primitive-atomic"; + version = "0.1.0.1"; + sha256 = "0q7lgirw0a75cd0157xq705wnns45d4nx2gfgmvvx0qi6rzvx45s"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; + testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-checked" = callPackage @@ -182151,25 +182954,27 @@ self: { }) {}; "primitive-containers" = callPackage - ({ mkDerivation, aeson, base, containers, contiguous, deepseq - , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort - , quantification, QuickCheck, quickcheck-classes, random, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + ({ mkDerivation, base, containers, contiguous, deepseq, gauge + , ghc-prim, hashable, HUnit, primitive, primitive-sort + , primitive-unlifted, QuickCheck, quickcheck-classes, random, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "primitive-containers"; - version = "0.3.3"; - sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; + version = "0.4.0"; + sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz"; + revision = "1"; + editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc"; libraryHaskellDepends = [ - aeson base contiguous deepseq hashable primitive primitive-sort - quantification text unordered-containers vector + base contiguous deepseq hashable primitive primitive-sort + primitive-unlifted ]; testHaskellDepends = [ - aeson base containers HUnit primitive quantification QuickCheck + base containers HUnit primitive primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base containers gauge ghc-prim primitive random + base containers gauge ghc-prim primitive primitive-unlifted random ]; description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; @@ -182185,8 +182990,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.7.1"; - sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n"; + version = "0.7.1.1"; + sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive profunctors vector @@ -182231,6 +183036,17 @@ self: { broken = true; }) {}; + "primitive-offset" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-offset"; + version = "0.1.0.0"; + sha256 = "0la56iw09x83ci5v82z8hpb0zdzdwi6awy5czszd78kj3n8ni3ax"; + libraryHaskellDepends = [ base primitive ]; + description = "Types for offsets into unboxed arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -182256,8 +183072,8 @@ self: { pname = "primitive-sort"; version = "0.1.0.0"; sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; - revision = "2"; - editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki"; + revision = "3"; + editedCabalFile = "1ld4wm2p75nl0qvzmgz1isgl1w59gk9ydg6hq0mijq362vx4ih2w"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty @@ -182266,6 +183082,33 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "primitive-stablename" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-stablename"; + version = "0.1"; + sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j"; + libraryHaskellDepends = [ base primitive ]; + description = "primitive operations on StableNames"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-unlifted" = callPackage + ({ mkDerivation, base, primitive, stm }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.1.0"; + sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-board" = callPackage @@ -183474,15 +184317,16 @@ self: { }) {}; "prometheus-proc" = callPackage - ({ mkDerivation, base, filepath, prometheus-client - , regex-applicative, unix, unix-memory + ({ mkDerivation, base, directory, filepath, prometheus-client + , regex-applicative, text, unix, unix-memory }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.0.0"; - sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + version = "0.1.1.0"; + sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9"; libraryHaskellDepends = [ - base filepath prometheus-client regex-applicative unix unix-memory + base directory filepath prometheus-client regex-applicative text + unix unix-memory ]; description = "Export metrics from /proc for the current process"; license = stdenv.lib.licenses.bsd3; @@ -185494,8 +186338,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.7"; - sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; + version = "1.5.1.8"; + sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -185510,7 +186354,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_1_8" = callPackage + "pusher-http-haskell_1_5_1_9" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -185518,8 +186362,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.8"; - sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f"; + version = "1.5.1.9"; + sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -186096,8 +186940,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.0"; - sha256 = "1kbd88p0px9p8w9v9jgxv03xsl2b7ksjsf6m5c5xffpmjilij9b4"; + version = "0.9.1"; + sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -186746,19 +187590,20 @@ self: { broken = true; }) {}; - "quickcheck-classes_0_6_1_0" = callPackage + "quickcheck-classes_0_6_2_1" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers - , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings - , tagged, tasty, tasty-quickcheck, transformers, vector + , contravariant, fail, primitive, primitive-addr, QuickCheck + , semigroupoids, semigroups, semirings, tagged, tasty + , tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.1.0"; - sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; + version = "0.6.2.1"; + sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig"; libraryHaskellDepends = [ - aeson base base-orphans bifunctors containers fail primitive - QuickCheck semigroupoids semigroups semirings tagged transformers - vector + aeson base base-orphans bifunctors containers contravariant fail + primitive primitive-addr QuickCheck semigroupoids semigroups + semirings tagged transformers vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -186814,21 +187659,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_20" = callPackage + "quickcheck-instances_0_3_21" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, splitmix, tagged, text, time, transformers - , transformers-compat, unordered-containers, uuid-types, vector + , scientific, splitmix, tagged, text, time, time-compat + , transformers, transformers-compat, unordered-containers + , uuid-types, vector }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.20"; - sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + version = "0.3.21"; + sha256 = "0kk9i5lck40jbx1sxcvaq66hywgnfslcx2cgy7lacq4cnjmyzrh1"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time - transformers transformers-compat unordered-containers uuid-types - vector + time-compat transformers transformers-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ base containers QuickCheck tagged uuid-types @@ -187129,8 +187975,8 @@ self: { ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; - version = "0.3"; - sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + version = "0.3.1"; + sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl"; libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; @@ -190197,27 +191043,6 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.3.1"; - sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_3_1_1" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; version = "1.3.1.1"; sha256 = "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a"; libraryHaskellDepends = [ @@ -190228,7 +191053,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -190455,24 +191279,6 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.2"; - sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; - revision = "1"; - editedCabalFile = "082f4dmdvbnv6jq28mrva8clxif366vcbn9m8d1bb8lcf9h3qxjb"; - libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; - testHaskellDepends = [ - base deepseq generics-sop hspec should-not-typecheck - ]; - description = "Record subtyping and record utilities with generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "records-sop_0_1_0_3" = callPackage - ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec - , should-not-typecheck - }: - mkDerivation { - pname = "records-sop"; version = "0.1.0.3"; sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; @@ -190481,7 +191287,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -191914,21 +192719,6 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.2.3.1"; - sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim mtl parsec regex-base - ]; - description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "regex-tdfa_1_2_3_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl - , parsec, regex-base - }: - mkDerivation { - pname = "regex-tdfa"; version = "1.2.3.2"; sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf"; libraryHaskellDepends = [ @@ -191936,7 +192726,6 @@ self: { ]; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-tdfa-pipes" = callPackage @@ -192284,23 +193073,23 @@ self: { "registry" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl , multimap, protolude, random, resourcet, semigroupoids, semigroups , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell , text, transformers-base, universum }: mkDerivation { pname = "registry"; - version = "0.1.3.6"; - sha256 = "19wch1vd41r3hvgr9a1yjvbiz7fmib1qlhviqivsdd5apncgn2jk"; + version = "0.1.5.1"; + sha256 = "1yvfrxhldbw6y8rawx5dddqrbgn8z8fsg5n745bx8wrag63s0vna"; libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet + base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base ]; testHaskellDepends = [ async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize MonadRandom mtl multimap protolude - random resourcet semigroupoids semigroups tasty tasty-discover + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover tasty-hedgehog tasty-th template-haskell text transformers-base universum ]; @@ -192311,27 +193100,27 @@ self: { broken = true; }) {}; - "registry_0_1_4_2" = callPackage + "registry_0_1_5_2" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum }: mkDerivation { pname = "registry"; - version = "0.1.4.2"; - sha256 = "0jfwxpf4w4laj0allbalkb0haircf0w33j0h2c2b5dzrhmmsg2gp"; + version = "0.1.5.2"; + sha256 = "1spvc9y985820f945zvp822w8bxrrmny7rwcfy94nky4mv5gk4i0"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base ]; testHaskellDepends = [ async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; @@ -192340,6 +193129,33 @@ self: { broken = true; }) {}; + "registry-hedgehog" = callPackage + ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph + , multimap, protolude, registry, tasty, tasty-discover + , tasty-hedgehog, tasty-th, template-haskell, text, transformers + , universum, unordered-containers + }: + mkDerivation { + pname = "registry-hedgehog"; + version = "0.2.0.0"; + sha256 = "19wjy4dmv3cycql0aharg6qxd7bkb87qkr206apfi0km58mb01d8"; + libraryHaskellDepends = [ + base containers hedgehog mmorph multimap protolude registry tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers universum unordered-containers + ]; + testHaskellDepends = [ + base containers generic-lens hedgehog mmorph multimap protolude + registry tasty tasty-discover tasty-hedgehog tasty-th + template-haskell text transformers universum unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "utilities to work with Hedgehog generators and `registry`"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -192545,10 +193361,12 @@ self: { }: mkDerivation { pname = "relation"; - version = "0.4"; - sha256 = "1jy5m0jih6ik05zagngrskk1ibiiblxsydxgdq6kjx1aa2pqnmqi"; + version = "0.5"; + sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testHaskellDepends = [ + base containers hedgehog hspec hw-hspec-hedgehog + ]; testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; @@ -192583,8 +193401,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.12.1.0"; - sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k"; + version = "0.12.2.1"; + sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -192606,8 +193424,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.1.1"; - sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk"; + version = "0.7.2.0"; + sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -192640,13 +193458,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.1"; - sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; + version = "0.6.0.0"; + sha256 = "1f37pzz60zrg5z09vf6sdp9in5f78kyvxag6gbyanapi7iki14k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192654,8 +193472,13 @@ self: { relational-query relational-query-HDBC relational-schemas template-haskell ]; + executableHaskellDepends = [ + base product-isomorphic relational-query template-haskell time + ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-schemas" = callPackage @@ -192664,8 +193487,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.6.2"; - sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; + version = "0.1.7.0"; + sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; libraryHaskellDepends = [ base bytestring containers relational-query template-haskell time ]; @@ -193800,8 +194623,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.3.1"; - sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y"; + version = "1.3.1.1"; + sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -193816,6 +194639,8 @@ self: { pname = "reroute"; version = "0.5.0.0"; sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r"; + revision = "2"; + editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k"; libraryHaskellDepends = [ base deepseq hashable http-api-data hvect mtl text unordered-containers @@ -195694,6 +196519,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RNG within an IORef for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rob" = callPackage @@ -195867,6 +196694,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -197675,8 +198504,8 @@ self: { }: mkDerivation { pname = "safe-money-xmlbf"; - version = "0.1.1"; - sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6"; + version = "0.1.2"; + sha256 = "04jpv05w1q2xdmh78i5xy3j48vk7qsnb0dpjr3zfbqs0qwpc9vld"; libraryHaskellDepends = [ base safe-money text xmlbf ]; testHaskellDepends = [ base bytestring safe-money tasty tasty-hunit tasty-quickcheck text @@ -200888,19 +201717,17 @@ self: { }) {}; "selective" = callPackage - ({ mkDerivation, base, checkers, containers, mtl, QuickCheck, tasty + ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: mkDerivation { pname = "selective"; - version = "0.1.0"; - sha256 = "1f30y2q5xph8jp2pfwkqdy59byad3q70kfp9jgcy2039i268fjfv"; - revision = "1"; - editedCabalFile = "1p6r23ahxpsq6rkb925ryd0cn09876z435q61wfz4r2rnb3s2wb2"; - libraryHaskellDepends = [ base containers mtl transformers ]; + version = "0.2"; + sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms"; + libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ - base checkers containers mtl QuickCheck tasty - tasty-expected-failure tasty-quickcheck + base containers mtl QuickCheck tasty tasty-expected-failure + tasty-quickcheck ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; @@ -201130,6 +201957,8 @@ self: { pname = "semigroups"; version = "0.18.5"; sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb"; + revision = "1"; + editedCabalFile = "1inqcxrzzs8xz60pvbmznyi6g6xwzpxv7p6dqlcwariz31grzvs1"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; @@ -201269,14 +202098,14 @@ self: { }) {}; "semver" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty - , tasty-hunit, text + ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable + , tasty, tasty-hunit, text }: mkDerivation { pname = "semver"; - version = "0.3.3.1"; - sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; + version = "0.3.4"; + sha256 = "0swffqyqraz2nxn64mwxp29zfdq7135q2j815yzwh2pk135xmns2"; + libraryHaskellDepends = [ attoparsec base deepseq hashable text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Representation, manipulation, and de/serialisation of Semantic Versions"; @@ -203236,8 +204065,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "6"; - editedCabalFile = "0pqn5lxcicccy73xbxsaqkxlga0ljc2kr8ysmdffxyndjyph4237"; + revision = "7"; + editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -204248,6 +205077,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-tags" = callPackage + ({ mkDerivation, base, containers, lens, servant, servant-mock + , servant-server, servant-swagger, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-tags"; + version = "0.1.0.0"; + sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64"; + libraryHaskellDepends = [ + base containers lens servant servant-mock servant-server + servant-swagger swagger2 text + ]; + description = "Swagger Tags for Servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, swagger2, text @@ -205280,20 +206125,26 @@ self: { }) {inherit (pkgs) zlib;}; "sgd" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , deepseq, filepath, hmatrix, logfloat, monad-par, mtl, parallel - , pipes, primitive, random, random-shuffle, temporary, vector + ({ mkDerivation, ad, base, binary, bytestring, containers + , data-default, deepseq, filepath, hmatrix, logfloat, monad-par + , mtl, parallel, pipes, primitive, random, random-shuffle, tasty + , tasty-hunit, temporary, vector }: mkDerivation { pname = "sgd"; - version = "0.7.0.1"; - sha256 = "1bfj74i9m1989wav6irlfiwgq8mgyf9g49cpdipgdiqqb4qmhv13"; + version = "0.8.0.2"; + sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq filepath hmatrix logfloat monad-par mtl parallel pipes primitive random random-shuffle temporary vector ]; - description = "Stochastic gradient descent"; + testHaskellDepends = [ + ad base binary bytestring containers data-default deepseq filepath + hmatrix logfloat monad-par mtl parallel pipes primitive random + random-shuffle tasty tasty-hunit temporary vector + ]; + description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -205486,8 +206337,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.9"; - sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk"; + version = "0.18.2"; + sha256 = "1drzcwspj0q9s3mpba291pich0my9pp3qrra90slv6carckcrzi8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206248,6 +207099,8 @@ self: { pname = "shellmet"; version = "0.0.1"; sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk"; + revision = "1"; + editedCabalFile = "0v6j5fgmbbqizqx800adnkij1b1b8f7zkjmyfqvcpgljgg6xada5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -206408,8 +207261,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.4.0.0"; - sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr"; + version = "0.5.0.0"; + sha256 = "03lm8np6hrbzcwzfknvixm6fjsnmjr9s379i9mwxq5d0ndf66y8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206702,6 +207555,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.3"; + sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -207262,6 +208132,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd-args_0_1_2" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.2"; + sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -207369,6 +208251,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-enumeration" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "simple-enumeration"; + version = "0.1"; + sha256 = "08zqs36v8vm3iqz9pnj6df0f8c15j9gl0883xxbr27nma9mwqygx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Finite or countably infinite sequences of values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-eval" = callPackage ({ mkDerivation, base, parsec, text, transformers }: mkDerivation { @@ -208162,6 +209056,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simplistic-generics" = callPackage + ({ mkDerivation, base, comonad, kind-apply }: + mkDerivation { + pname = "simplistic-generics"; + version = "0.1.0.0"; + sha256 = "11z02m4dr9p2y29xwhy6a3l2cz2np164c8cwp0a0b9vkhphw4y1j"; + libraryHaskellDepends = [ base comonad kind-apply ]; + description = "Generic programming without too many type classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -208345,18 +209250,19 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade , contravariant, doctest, either, HUnit, pipes, profunctors - , QuickCheck, streaming, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, transformers, vector + , QuickCheck, semigroups, streaming, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.8.1"; - sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx"; - revision = "2"; - editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531"; + version = "0.8.1.1"; + sha256 = "1l8asyjbhhzj0zccf86g0scm2h8hp42c3v3wyymcvfwmd2wspnfr"; + revision = "1"; + editedCabalFile = "0xdl110lvjq23vd7p6q0fc68yspk72m5ixs90yc8j2g7fi52izsx"; libraryHaskellDepends = [ - attoparsec base bytestring colonnade streaming text transformers - vector + attoparsec base bytestring colonnade semigroups streaming text + transformers vector ]; testHaskellDepends = [ base bytestring colonnade contravariant doctest either HUnit pipes @@ -210136,8 +211042,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.4"; - sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4"; + version = "0.1.0.5"; + sha256 = "04zn5d8qz17gm1c77xmas059hvl4ach8sayh81q676fkadiwk3x7"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -211602,6 +212508,8 @@ self: { pname = "soap-tls"; version = "0.1.1.4"; sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; + revision = "1"; + editedCabalFile = "11djy824gaw3cbsvphq263hxjrn1b3v5p1kdivsvlyn7q9bgvms9"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -212343,6 +213251,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "spacecookie" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, fast-logger, filepath, hxt-unicode, mtl, socket + , transformers, unix + }: + mkDerivation { + pname = "spacecookie"; + version = "0.2.0.1"; + sha256 = "04gghnfkbb26xykgksif8xx5s9pv9f1rjgznlx5mpniwk11ij940"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory fast-logger + filepath hxt-unicode mtl socket transformers unix + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers directory filepath mtl + socket transformers unix + ]; + description = "gopher server daemon"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212947,8 +213878,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.1"; - sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p"; + version = "0.1.2.2"; + sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -213683,8 +214614,8 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.6.2"; - sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; + version = "0.1.6.3"; + sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; @@ -215864,17 +216795,16 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp , libuv, primitive, QuickCheck, quickcheck-instances, scientific - , stm, template-haskell, time, word8 + , stm, tagged, template-haskell, time, unordered-containers, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.1.0"; - sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; - revision = "1"; - editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; + version = "0.2.0.0"; + sha256 = "0j2ywcrzwx2q9fwa8slx7clzgrmfsnfz22ma08b77ii0yg0za271"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time word8 + integer-gmp primitive QuickCheck scientific stm tagged + template-haskell time unordered-containers ]; libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; @@ -216228,8 +217158,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.2"; - sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w"; + version = "1.2.0.3"; + sha256 = "0bypqk2813q7ydhialig34gyrpqcfpj8w0mcq49h1j57g7hfm293"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -216687,6 +217617,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_1_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.1.1"; + sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -216782,15 +217764,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_36_0" = callPackage + "stratosphere_0_37_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.36.0"; - sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k"; + version = "0.37.0"; + sha256 = "02m5cf4cxf32y3haqgx0nvwy64fmhbpmgk4g3i024mh1ab00k5fn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217025,27 +218007,6 @@ self: { }: mkDerivation { pname = "streaming-attoparsec"; - version = "1.0.0"; - sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z"; - revision = "2"; - editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx"; - libraryHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring - ]; - testHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring tasty - tasty-hunit - ]; - description = "Attoparsec integration for the streaming ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-attoparsec_1_0_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, streaming - , streaming-bytestring, tasty, tasty-hunit - }: - mkDerivation { - pname = "streaming-attoparsec"; version = "1.0.0.1"; sha256 = "151gjivqbadh1wfbj53d0ahw4cjax4nnhg1v0l1piqnp1mbz7j8y"; libraryHaskellDepends = [ @@ -217057,7 +218018,6 @@ self: { ]; description = "Attoparsec integration for the streaming ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-base64" = callPackage @@ -217238,8 +218198,8 @@ self: { }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.1.2"; - sha256 = "0ra4svn595qx08rfg3qz2n30y6dsv2xj2kdl4s61xbhi4cmff819"; + version = "0.3.1.3"; + sha256 = "07fk9kdfh2983qawl78sy0ibqa8ngwna2slz3ckbm1fgc8sybzip"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -218321,15 +219281,16 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory - , stripe-concepts, text + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , memory, stripe-concepts, text }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.0"; - sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps"; + version = "1.0.0.1"; + sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; libraryHaskellDepends = [ - base bytestring cryptonite hex-text memory stripe-concepts text + base base16-bytestring bytestring cryptonite memory stripe-concepts + text ]; testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; @@ -219152,8 +220113,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "1"; - editedCabalFile = "0cw9vzvmmg13iyqh9g12c6yblv4ibxzcn61n4y7s59zmy4rqxg65"; + revision = "2"; + editedCabalFile = "0y3c59flsiz9w5a88ciy3jxzs1hvnlzyb3z5bz0199g0wrpwjxr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219617,8 +220578,8 @@ self: { pname = "sv"; version = "1.3.1"; sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; - revision = "1"; - editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn"; + revision = "2"; + editedCabalFile = "1c0q010bpzdmjlncjn58fvz50l5z2wqp4hjpj0isvdr5iq96pgza"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -219695,8 +220656,8 @@ self: { pname = "sv-core"; version = "0.4.1"; sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; - revision = "1"; - editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i"; + revision = "2"; + editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -220551,7 +221512,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symengine-hs" = callPackage ({ mkDerivation, base, gmp, gmpxx, symengine }: @@ -220570,7 +221532,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symmetric-properties" = callPackage ({ mkDerivation, base, containers, hspec, HUnit }: @@ -221482,6 +222445,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "systemd_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "1.2.0"; + sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -222793,15 +223771,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_2_1" = callPackage + "tasty_1_2_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.2.1"; - sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia"; + version = "1.2.2"; + sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -222976,10 +223954,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "0.2.0.0"; - sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; - revision = "6"; - editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43"; + version = "1.0.0.1"; + sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -223008,6 +223984,8 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-hspec" = callPackage @@ -223057,6 +224035,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-hunit_0_10_0_2" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.0.2"; + sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -223187,19 +224177,23 @@ self: { }) {}; "tasty-lua" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, hslua - , tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text }: mkDerivation { pname = "tasty-lua"; - version = "0.1.0"; - sha256 = "199zhrd48ixyi32spnm85v0dj6i09sl3rwi42kaxdlxkkmc54i1z"; + version = "0.2.0"; + sha256 = "0adiz7g9lri81rlnwshwswmp0ajfs4y4im37rc04krz8qr26s4v7"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; - testHaskellDepends = [ base directory hslua tasty tasty-hunit ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -223222,10 +224216,8 @@ self: { }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.10"; - sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h"; - revision = "1"; - editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx"; + version = "0.10.1"; + sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; @@ -224263,8 +225255,6 @@ self: { ]; description = "Portable temporary files and directories with automatic deletion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tempus" = callPackage @@ -225614,6 +226604,8 @@ self: { pname = "text"; version = "1.2.3.1"; sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; + revision = "2"; + editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -225692,29 +226684,6 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.5"; - sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q"; - libraryHaskellDepends = [ - base base-prelude bytestring deferred-folds semigroups text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "text-builder_0_6_5_1" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , deferred-folds, QuickCheck, quickcheck-instances, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "text-builder"; version = "0.6.5.1"; sha256 = "0g40s5md7kfmhqsxxrfliwb3p4whg3m2wp31bai051nx1ddkkvay"; libraryHaskellDepends = [ @@ -225728,7 +226697,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -226247,8 +227215,8 @@ self: { pname = "text-short"; version = "0.1.2"; sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; - revision = "1"; - editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj"; + revision = "2"; + editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -227265,26 +228233,6 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.1.0"; - sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-utilities_0_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; version = "0.2.3.0"; sha256 = "0bl4j81k7szn0lza8rnn1db6glc57dsn63ni0hwbwr3kxa3pb4x4"; libraryHaskellDepends = [ @@ -227297,7 +228245,6 @@ self: { ]; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thank-you-stars" = callPackage @@ -227468,24 +228415,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "these_0_8" = callPackage + "these_0_8_1" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors , binary, containers, data-default-class, deepseq, hashable, keys - , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids + , tagged, tasty, tasty-quickcheck, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "these"; - version = "0.8"; - sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; - revision = "1"; - editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11"; + version = "0.8.1"; + sha256 = "0fy63prcdl21fl1vp039wi2j5vr2vgahf537pcg068a6zkfmaiwn"; libraryHaskellDepends = [ aeson assoc base base-compat bifunctors binary containers data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances + semigroupoids tagged transformers transformers-compat + unordered-containers vector vector-instances ]; testHaskellDepends = [ aeson base base-compat bifunctors binary containers hashable lens @@ -228334,14 +229280,14 @@ self: { broken = true; }) {}; - "time_1_9_2" = callPackage + "time_1_9_3" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9.2"; - sha256 = "05d0n44rwpqkjkns9nlgw2gpfv643a0bzp9cx97az0wmn31618nx"; + version = "1.9.3"; + sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -228378,6 +229324,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_2_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.2.2"; + sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -228957,17 +229921,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timer-wheel_0_2_0" = callPackage - ({ mkDerivation, atomic-primops, base, ghc-prim, primitive - , psqueues, random - }: + "timer-wheel_0_2_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: mkDerivation { pname = "timer-wheel"; - version = "0.2.0"; - sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; - libraryHaskellDepends = [ - atomic-primops base ghc-prim primitive psqueues - ]; + version = "0.2.0.1"; + sha256 = "1m3bv095kbm4ksva3plhggkq2c0jf441wm994l57jfmlcng2i4xy"; + libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; @@ -230093,7 +231053,7 @@ self: { broken = true; }) {}; - "tomland_1_0_0" = callPackage + "tomland_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -230103,10 +231063,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.0.0"; - sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; - revision = "1"; - editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; + version = "1.0.1.0"; + sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230298,8 +231256,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.6.0"; - sha256 = "1nwjf5qmvshgcg2zf0mqav5kz19rj0a4vd7w6x1zbalysj9v5nb7"; + version = "0.1.6.1"; + sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230990,6 +231948,40 @@ self: { broken = true; }) {}; + "trans-fx-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "trans-fx-core"; + version = "0.0.1"; + sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs"; + libraryHaskellDepends = [ base ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-data" = callPackage + ({ mkDerivation, base, trans-fx-core }: + mkDerivation { + pname = "trans-fx-data"; + version = "0.0.1"; + sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid"; + libraryHaskellDepends = [ base trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-io" = callPackage + ({ mkDerivation, base, time, trans-fx-core, trans-fx-data }: + mkDerivation { + pname = "trans-fx-io"; + version = "0.0.1"; + sha256 = "1yf3j35q0j5if1hpl11083bwrcyyr378wwnp98m1f5gsrlj62qpw"; + libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ]; + testHaskellDepends = [ base time trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transaction" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable , QuickCheck @@ -231156,6 +232148,8 @@ self: { pname = "transformers-bifunctors"; version = "0.1"; sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w"; + revision = "1"; + editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs"; libraryHaskellDepends = [ base mmorph transformers ]; description = "Bifunctors over monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -231165,23 +232159,11 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.6.4"; - sha256 = "036f7qnzhxjbflypgggkd3v0gjpbcqbb1ryagyiknlrnsrav8zxd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - description = "A small compatibility shim for the transformers library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "transformers-compat_0_6_5" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "transformers-compat"; version = "0.6.5"; sha256 = "02v2fjbvcrlpvhcsssap8dy8y9pp95jykrlc5arm39sxa48wyrys"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -231289,10 +232271,8 @@ self: { ({ mkDerivation, base, transformers, writer-cps-transformers }: mkDerivation { pname = "transformers-lift"; - version = "0.2.0.1"; - sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; - revision = "3"; - editedCabalFile = "0rkbjlpn460gn93qr0l7025ggkgj46j6pkcil6m2chkzk91cpk9i"; + version = "0.2.0.2"; + sha256 = "1w6wb8f8ad41l3gl4879289rb22jsgsj4qdaygf0wff45d04mq94"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -231676,33 +232656,6 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.0.2"; - sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; - revision = "2"; - editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_0_2_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; version = "0.0.2.1"; sha256 = "0hz7jklzb4cc63l68jxc58ik0ybgim9niwq2gfi0cskv5g2yr3ym"; libraryHaskellDepends = [ @@ -231717,7 +232670,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -234330,6 +235282,8 @@ self: { pname = "typed-process"; version = "0.2.4.0"; sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; + revision = "1"; + editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -234589,6 +235543,8 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typerep-map_0_3_2" = callPackage @@ -234601,6 +235557,8 @@ self: { pname = "typerep-map"; version = "0.3.2"; sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; + revision = "1"; + editedCabalFile = "1ka2ah7cg7hzd7yvnj6iasa57bszzif1b5r94sd8fk00l1qspjag"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; @@ -234617,6 +235575,7 @@ self: { description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "types-compat" = callPackage @@ -236538,6 +237497,8 @@ self: { pname = "unix-compat"; version = "0.5.1"; sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; + revision = "1"; + editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; @@ -236842,6 +237803,8 @@ self: { pname = "unordered-containers"; version = "0.2.10.0"; sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + revision = "1"; + editedCabalFile = "01727lm2spbqfn0rl89zv9zhpsmnls0kmizyckqf5nc3j9d0k6sy"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -238839,6 +239802,8 @@ self: { pname = "validation"; version = "1.1"; sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; + revision = "1"; + editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp"; libraryHaskellDepends = [ base bifunctors deepseq lens semigroupoids semigroups ]; @@ -239467,6 +240432,8 @@ self: { pname = "vec"; version = "0.1.1"; sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; + revision = "1"; + editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids transformers @@ -239552,8 +240519,8 @@ self: { pname = "vector"; version = "0.12.0.3"; sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq"; - revision = "1"; - editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr"; + revision = "2"; + editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans HUnit primitive QuickCheck random @@ -239572,8 +240539,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.1"; sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; - revision = "1"; - editedCabalFile = "18jm5zjzbphyzgc1hjqay04c6j4h7bq2bs8rzngnxk2q8gv658vz"; + revision = "2"; + editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -239890,6 +240857,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_2_0_1" = callPackage + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , finite-typelits, hashable, indexed-list-literals, primitive + , vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.2.0.1"; + sha256 = "1l7d9nzazxh372pc7fwvbxib7hfmgkjg8c5iv7m5d240n1qk13pj"; + libraryHaskellDepends = [ + adjunctions base 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 { @@ -240249,6 +241234,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vflow-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, ip, json-alt + , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes + , scientific, text + }: + mkDerivation { + pname = "vflow-types"; + version = "0.1"; + sha256 = "01iycni552yrikn59lh6mvsf16aq52kcgwapqk6al8y623vqg5hi"; + libraryHaskellDepends = [ + aeson base ip json-alt json-autotype scientific text + ]; + testHaskellDepends = [ + aeson base bytestring ip json-alt neat-interpolation QuickCheck + quickcheck-classes text + ]; + description = "types for ingesting vflow data with aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "vfr-waypoints" = callPackage ({ mkDerivation, base, containers, dimensional, fuzzy , geodetic-types, lens, monoid-subclasses, optparse-applicative @@ -240951,23 +241958,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "void"; - version = "0.7.2"; - sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk"; - libraryHaskellDepends = [ base ]; - description = "A Haskell 98 logically uninhabited data type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "void_0_7_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "void"; version = "0.7.3"; sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk"; libraryHaskellDepends = [ base ]; description = "A Haskell 98 logically uninhabited data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vorbiscomment" = callPackage @@ -242619,8 +243614,8 @@ self: { pname = "wai-middleware-travisci"; version = "0.1.0"; sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv"; - revision = "1"; - editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3"; + revision = "2"; + editedCabalFile = "0j1k2y75gwbny72zf5nrwzanh7sn2plscnrjd4hw5npccxi4dchx"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite http-types text transformers vault wai @@ -243984,8 +244979,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.8.3.1"; - sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; + version = "0.8.3.2"; + sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory @@ -244674,22 +245669,6 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.3.0"; - sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_3_1" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; version = "0.10.3.1"; sha256 = "1hpszqb61xhbgfvxd6g56kdfxsyi14q7xh12jbdnyycbfijb9bqk"; libraryHaskellDepends = [ @@ -244698,7 +245677,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -245056,6 +246034,8 @@ self: { pname = "wide-word"; version = "0.1.0.8"; sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj"; + revision = "1"; + editedCabalFile = "189p1g51xx0a1lhxlhr0i8qv7mvr4zsjfdpb4i8ja2hfi0ssszdx"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes @@ -245141,24 +246121,6 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.3"; - sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_4" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; version = "0.1.2.4"; sha256 = "14cl18vfna21mq3ln9y3s6x7yvp13hynqfmjjv192z928wabyxqz"; libraryHaskellDepends = [ @@ -245169,7 +246131,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -245214,25 +246175,6 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.6"; - sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_7" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; version = "0.2.0.7"; sha256 = "00lpx5lqahd5wx3f2rp0glhi9m5k0miys39fpq7p57iwvdzjhgxa"; libraryHaskellDepends = [ @@ -245244,7 +246186,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -248735,6 +249676,8 @@ self: { pname = "xmlgen"; version = "0.6.2.2"; sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj"; + revision = "1"; + editedCabalFile = "0vwnqd0lsw81llsn0psga5r6pw7jh69vfbj3rnz7c2fpkc0gjh3j"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -248892,8 +249835,8 @@ self: { base containers extensible-exceptions QuickCheck X11 ]; postInstall = '' - install -D man/xmonad.1 $doc/share/man/man1/xmonad.1 - install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs + install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1 + install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -251955,8 +252898,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.6.1"; - sha256 = "00f235w631rdw5kkrkb0xqvpw18k4faiv6sjzbbn5jzzi5asscyj"; + version = "0.12.6.2"; + sha256 = "0w9fmqk49b4c9g26dhrrmbwshrfcrnwcnsba97jyhb2m8bc4s1xj"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -254030,8 +254973,8 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "zero"; - version = "0.1.4"; - sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q"; + version = "0.1.5"; + sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw"; libraryHaskellDepends = [ base semigroups ]; description = "Semigroups with absorption"; license = stdenv.lib.licenses.bsd3; @@ -255053,6 +255996,28 @@ self: { broken = true; }) {}; + "zstd_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib + }: + mkDerivation { + pname = "zstd"; + version = "0.1.1.2"; + sha256 = "147s496zvw13akxqzg65mgfvk3bvhrcilxgf8n786prxg5cm4jz2"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "zsyntax" = callPackage ({ mkDerivation, base, constraints, containers, mtl, multiset }: mkDerivation { diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index fbe1f991d92e5..04cbd88989a6b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -121,7 +121,7 @@ let # Use cabal2nix to create a default.nix for the package sources found at 'src'. haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let - sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; + sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index cc88b32119e75..a88d07d1655fa 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,15 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd"; + "8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3"; }; revs = { "8.0" = "8.0"; - "8.1" = "8.1"; + "8.2" = "8.2"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "acl2-devel"; diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix index 40136fd22de85..e240e1907e061 100644 --- a/pkgs/development/interpreters/elixir/1.8.nix +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.8.1"; - sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9"; + version = "1.8.2"; + sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 9d65997ffe5ab..c2147fb5f6a75 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.2"; # always change at once with ./minimal.nix + version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4"; + sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 0710c4e2d2a6b..a3d4a7a3c4fd4 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx"; + sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 48ca86aaa4b7b..5c25da9205569 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.10"; + version = "1.7.11"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "186wwlbz90gmzr4vsykk4z8bgkd45yhbyfpn8bqwidf9fcimcr2a"; + sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 580cd1bd73f5b..cbd29a095d457 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,13 +1,13 @@ { stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: let - version = "1.8.2"; + version = "1.9.0"; in stdenv.mkDerivation rec { name = "avro-c-${version}"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6"; + sha256 = "1ch8z9jpkjxjx2zh28z0946gz3vwj1jnkrzg4vwvfa287128cml0"; }; postPatch = '' diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index f46571587efd8..7233a187053e4 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -37,9 +37,11 @@ stdenv.mkDerivation rec { "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" - ++ lib.optional (apis != ["*"]) - "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DENABLE_TESTING=OFF" + "-DCURL_HAS_H2=0" + ] ++ lib.optional (apis != ["*"]) + "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; preConfigure = '' diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 603d7883c647e..f4931dfe54740 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -7,34 +7,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - - patches = stdenv.lib.optionals stdenv.isCygwin [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ]; }) diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch deleted file mode 100644 index 61791c60d9e07..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch +++ /dev/null @@ -1,20 +0,0 @@ -These were fixed in ~1.7.0-46 - ---- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600 -+++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500 -@@ -40,15 +40,6 @@ - # include <inttypes.h> - # else - # include <stdint.h> -- --// There is a bug in Cygwin two _C macros --# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) --# undef INTMAX_C --# undef UINTMAX_C --# define INTMAX_C(c) c##LL --# define UINTMAX_C(c) c##ULL --# endif -- - # endif - - #ifdef __QNX__ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch deleted file mode 100644 index 6641ba823b17b..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500 -@@ -44,8 +44,7 @@ - //------------------Locale support--------------------------------------------// - - #ifndef BOOST_IOSTREAMS_NO_LOCALE --# if defined(BOOST_NO_STD_LOCALE) || \ -- defined(__CYGWIN__) && \ -+# if defined(BOOST_NO_STD_LOCALE) && \ - ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \ - /**/ - # define BOOST_IOSTREAMS_NO_LOCALE ---- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500 -@@ -13,8 +13,7 @@ - - // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use. - #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX ) --# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ -- !defined(__CYGWIN__) \ -+# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) - /**/ - # define BOOST_IOSTREAMS_WINDOWS - # else diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch deleted file mode 100644 index 7932b0e124b5e..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500 -@@ -83,7 +83,7 @@ - # endif - # define BOOST_PYTHON_DECL_FORWARD - # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) --# elif (defined(_WIN32) || defined(__CYGWIN__)) -+# elif defined(_WIN32) - # if defined(BOOST_PYTHON_SOURCE) - # define BOOST_PYTHON_DECL __declspec(dllexport) - # define BOOST_PYTHON_BUILD_DLL ---- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500 -+++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500 -@@ -82,8 +82,8 @@ - // Some things we need in order to get Python.h to work with compilers other - // than MSVC on Win32 - // --#if defined(_WIN32) || defined(__CYGWIN__) --# if defined(__GNUC__) && defined(__CYGWIN__) -+#if defined(_WIN32) -+# if defined(__GNUC__) - - # define SIZEOF_LONG 4 - ---- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500 -+++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500 -@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char - - }}} - --# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE) -+# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE) - - # define BOOST_PYTHON_MODULE_INIT(name) \ - void init_module_##name(); \ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch deleted file mode 100644 index 969bb814bd104..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500 -@@ -28,11 +28,7 @@ - - #ifndef BOOST_REGEX_NO_FILEITER - --#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32) --#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" --#define BOOST_REGEX_FI_WIN32_MAP --#define BOOST_REGEX_FI_POSIX_DIR --#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) -+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) - #define BOOST_REGEX_FI_WIN32_MAP - #define BOOST_REGEX_FI_WIN32_DIR - #else diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch deleted file mode 100644 index 1a00851fa92e4..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch +++ /dev/null @@ -1,12 +0,0 @@ -OS_CYGWIN is used to assume cygpath, Win32-isms - ---- boost_1_48_0/tools/build/src/engine/jam.h -+++ boost_1_48_0/tools/build/src/engine/jam.h -@@ -245,7 +245,6 @@ - #endif - #if defined(__cygwin__) || defined(__CYGWIN__) - #define OSMINOR "OS=CYGWIN" -- #define OS_CYGWIN - #endif - #if defined(__FreeBSD__) && !defined(__DragonFly__) - #define OSMINOR "OS=FREEBSD" diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch deleted file mode 100644 index 4bc6ec9d36e16..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500 -+++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600 -@@ -376,7 +376,7 @@ local rule path-to-native ( paths * ) - # - local rule split-version ( version ) - { -- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ; -+ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ; - if ! $(major-minor[2]) || $(major-minor[3]) - { - ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch deleted file mode 100644 index 46308a59cb078..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500 -+++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500 -@@ -332,7 +332,11 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB - # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK - # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE -+#ifdef MSG_EOR - # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR -+#else -+# define BOOST_ASIO_OS_DEF_MSG_EOR 0 -+#endif - # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD - # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR - # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch deleted file mode 100644 index df3edf51e7b9a..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500 -+++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500 -@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc - ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange))) - # endif - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport) - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch deleted file mode 100644 index 3702d475c8e9a..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch +++ /dev/null @@ -1,1835 +0,0 @@ ---- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500 -@@ -42,7 +42,7 @@ protected: - BOOST_ASIO_DECL static void init_native_buffer( - native_buffer_type& buf, - const boost::asio::const_buffer& buffer); --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -61,7 +61,7 @@ protected: - buf.buf = const_cast<char*>(boost::asio::buffer_cast<const char*>(buffer)); - buf.len = static_cast<ULONG>(boost::asio::buffer_size(buffer)); - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -92,7 +92,7 @@ protected: - boost::asio::buffer_cast<const void*>(buffer))); - iov.iov_len = boost::asio::buffer_size(buffer); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - }; - - // Helper class to translate buffers into the native buffer representation. ---- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500 -@@ -474,7 +474,7 @@ - #endif // !defined(BOOST_ASIO_WINDOWS) - - // Windows: target OS version. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) - # if defined(_MSC_VER) || defined(__BORLANDC__) - # pragma message( \ -@@ -512,29 +512,29 @@ - # error You must add -D__USE_W32_SOCKETS to your compiler options. - # endif // !defined(__USE_W32_SOCKETS) - # endif // defined(__CYGWIN__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: minimise header inclusion. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) - # if !defined(WIN32_LEAN_AND_MEAN) - # define WIN32_LEAN_AND_MEAN - # endif // !defined(WIN32_LEAN_AND_MEAN) - # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: suppress definition of "min" and "max" macros. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_NOMINMAX) - # if !defined(NOMINMAX) - # define NOMINMAX 1 - # endif // !defined(NOMINMAX) - # endif // !defined(BOOST_ASIO_NO_NOMINMAX) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: IO Completion Ports. - #if !defined(BOOST_ASIO_HAS_IOCP) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) - # if !defined(UNDER_CE) - # if !defined(BOOST_ASIO_DISABLE_IOCP) -@@ -542,7 +542,7 @@ - # endif // !defined(BOOST_ASIO_DISABLE_IOCP) - # endif // !defined(UNDER_CE) - # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_HAS_IOCP) - - // Linux: epoll, eventfd and timerfd. -@@ -599,8 +599,7 @@ - #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) - # if defined(BOOST_ASIO_HAS_IOCP) \ - || !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # if !defined(__SYMBIAN32__) - # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) - # define BOOST_ASIO_HAS_SERIAL_PORT 1 -@@ -609,7 +608,6 @@ - # endif // defined(BOOST_ASIO_HAS_IOCP) - // || !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT) - - // Windows: stream handles. -@@ -633,11 +631,11 @@ - // Windows: object handles. - #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if !defined(UNDER_CE) - # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 - # endif // !defined(UNDER_CE) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) - #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - -@@ -654,12 +652,10 @@ - #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - -@@ -667,12 +663,10 @@ - #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - -@@ -680,12 +674,10 @@ - #if !defined(BOOST_ASIO_HAS_SIGACTION) - # if !defined(BOOST_ASIO_DISABLE_SIGACTION) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_SIGACTION 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION) - #endif // !defined(BOOST_ASIO_HAS_SIGACTION) - -@@ -700,7 +692,7 @@ - - // Can use getaddrinfo() and getnameinfo(). - #if !defined(BOOST_ASIO_HAS_GETADDRINFO) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) - # define BOOST_ASIO_HAS_GETADDRINFO 1 - # elif defined(UNDER_CE) ---- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500 -@@ -18,8 +18,7 @@ - #include <boost/asio/detail/config.hpp> - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include <cstddef> - #include <boost/system/error_code.hpp> -@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/addressof.hpp> - #include <boost/asio/detail/bind_handler.hpp> -@@ -116,6 +116,6 @@ private: - - #include <boost/asio/detail/pop_options.hpp> - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/addressof.hpp> - #include <boost/asio/detail/bind_handler.hpp> -@@ -116,6 +116,6 @@ private: - - #include <boost/asio/detail/pop_options.hpp> - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP ---- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500 -@@ -26,7 +26,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef win_fd_set_adapter fd_set_adapter; - #else - typedef posix_fd_set_adapter fd_set_adapter; ---- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500 -@@ -21,9 +21,9 @@ - #include <boost/asio/detail/assert.hpp> - #include <boost/asio/detail/noncopyable.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include <boost/asio/detail/socket_types.hpp> --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/push_options.hpp> - -@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( - + (reinterpret_cast<std::size_t>(p) >> 3); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - inline std::size_t calculate_hash_value(SOCKET s) - { - return static_cast<std::size_t>(s); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Note: assumes K and V are POD types. - template <typename K, typename V> ---- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500 -@@ -21,8 +21,7 @@ - #include <boost/asio/error.hpp> - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include <boost/asio/detail/push_options.hpp> - -@@ -448,6 +447,5 @@ int poll_write(int d, state_type state, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP ---- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #if !defined(BOOST_ASIO_WINDOWS) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset() - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - ---- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500 -@@ -18,8 +18,7 @@ - #include <boost/asio/detail/config.hpp> - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include <boost/asio/error.hpp> - #include <boost/asio/detail/reactive_descriptor_service.hpp> -@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_ - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500 -@@ -19,7 +19,7 @@ - #include <boost/asio/detail/config.hpp> - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include <cstring> - #include <boost/asio/detail/reactive_serial_port_service.hpp> -@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria - - #include <boost/asio/detail/pop_options.hpp> - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500 -@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_ - max_fd = fd_sets_[i].max_descriptor(); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty(); - fd_sets_[write_op].set(op_queue_[connect_op], ops); -@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_ - fd_sets_[except_op].set(op_queue_[connect_op], ops); - if (fd_sets_[except_op].max_descriptor() > max_fd) - max_fd = fd_sets_[except_op].max_descriptor(); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // We can return immediately if there's no work to do and the reactor is - // not supposed to block. -@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_ - // Dispatch all ready operations. - if (retval > 0) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - fd_sets_[except_op].perform(op_queue_[connect_op], ops); - fd_sets_[write_op].perform(op_queue_[connect_op], ops); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Exception operations must be processed first to ensure that any - // out-of-band data is read before normal data. ---- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500 -@@ -60,12 +60,10 @@ signal_state* get_signal_state() - void boost_asio_signal_handler(int signal_number) - { - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) -+ || defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_set_service::deliver_signal(signal_number); - #else // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - int saved_errno = errno; - signal_state* state = get_signal_state(); - signed_size_type result = ::write(state->write_descriptor_, -@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa - errno = saved_errno; - #endif // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - - #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) - ::signal(signal_number, boost_asio_signal_handler); -@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa - } - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - class signal_set_service::pipe_read_op : public reactor_op - { - public: -@@ -115,30 +111,25 @@ public: - }; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - signal_set_service::signal_set_service( - boost::asio::io_service& io_service) - : io_service_(boost::asio::use_service<io_service_impl>(io_service)), - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_(boost::asio::use_service<reactor>(io_service)), - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - next_(0), - prev_(0) - { - get_signal_state()->mutex_.init(); - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_.init_task(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - for (int i = 0; i < max_signal_number; ++i) - registrations_[i] = 0; -@@ -174,8 +165,7 @@ void signal_set_service::fork_service( - boost::asio::io_service::fork_event fork_ev) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - -@@ -217,11 +207,9 @@ void signal_set_service::fork_service( - } - #else // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - (void)fork_ev; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::construct( -@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - delete new_registration; - return ec; - } -@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser - if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the first service to be created, open a new pipe. - if (state->service_list_ == 0) - open_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - // Insert service into linked list of all services. - service->next_ = state->service_list_; -@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig - state->service_list_ = service; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Register for pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig - read_descriptor, service->reactor_data_, new pipe_read_op); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::remove_service(signal_set_service* service) -@@ -534,8 +520,7 @@ void signal_set_service::remove_service( - if (service->next_ || service->prev_ || state->service_list_ == service) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Disable the pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -544,7 +529,6 @@ void signal_set_service::remove_service( - lock.lock(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // Remove service from linked list of all services. - if (state->service_list_ == service) -@@ -556,19 +540,18 @@ void signal_set_service::remove_service( - service->next_ = 0; - service->prev_ = 0; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the last service to be removed, close the pipe. - if (state->service_list_ == 0) - close_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - } - } - - void signal_set_service::open_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - int pipe_fds[2]; -@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor - } - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::close_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - if (state->read_descriptor_ != -1) -@@ -612,7 +593,6 @@ void signal_set_service::close_descripto - state->write_descriptor_ = -1; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::start_wait_op( ---- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 -@@ -33,12 +33,12 @@ - # include <string> - #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ -+#if defined(BOOST_ASIO_WINDOWS) \ - || defined(__MACH__) && defined(__APPLE__) - # if defined(BOOST_ASIO_HAS_PTHREADS) - # include <pthread.h> - # endif // defined(BOOST_ASIO_HAS_PTHREADS) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - // || defined(__MACH__) && defined(__APPLE__) - - #include <boost/asio/detail/push_options.hpp> -@@ -50,9 +50,9 @@ namespace socket_ops { - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - struct msghdr { int msg_namelen; }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) - // HP-UX doesn't declare these functions extern "C", so they are declared again -@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c - - inline void clear_last_error() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - WSASetLastError(0); - #else - errno = 0; -@@ -78,7 +78,7 @@ template <typename ReturnType> - inline ReturnType error_wrapper(ReturnType return_value, - boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(WSAGetLastError(), - boost::asio::error::get_system_category()); - #else -@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - if (result != 0 - && (ec == boost::asio::error::would_block -@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta - // current OS where this behaviour is seen, Windows, says that the socket - // remains open. Therefore we'll put the descriptor back into blocking - // mode and have another attempt at closing it. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = 0; - ::ioctlsocket(s, FIONBIO, &arg); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - # if defined(__SYMBIAN32__) - int flags = ::fcntl(s, F_GETFL, 0); - if (flags >= 0) -@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta - ioctl_arg_type arg = 0; - ::ioctl(s, FIONBIO, &arg); - # endif // defined(__SYMBIAN32__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - state &= ~non_blocking; - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - } - -@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, - // Check if the connect operation has finished. This is required since we may - // get spurious readiness notifications from the reactor. - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, - zero_timeout.tv_usec = 0; - int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, - fds.revents = 0; - int ready = ::poll(&fds, 1, 0); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (ready == 0) - { -@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, - int socketpair(int af, int type, int protocol, - socket_type sv[2], boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(af); - (void)(type); - (void)(protocol); -@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy - - #if defined(SIOCATMARK) - ioctl_arg_type value = 0; --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - # if defined(ENOTTY) -@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s - } - - ioctl_arg_type value = 0; --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - #if defined(ENOTTY) -@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v - base = static_cast<T>(addr); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - void init_buf(buf& b, void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast<char*>(data); - b.len = static_cast<u_long>(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, data); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - void init_buf(buf& b, const void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast<char*>(const_cast<void*>(data)); - b.len = static_cast<u_long>(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, const_cast<void*>(data)); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) -@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast<DWORD>(count); - DWORD bytes_transferred = 0; -@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast<int>(count); -@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recv(socket_type s, state_type state, buf* bufs, -@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast<DWORD>(count); - DWORD bytes_transferred = 0; -@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast<int>(*addrlen); -@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, -@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, - int in_flags, int& out_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - out_flags = 0; - return socket_ops::recv(s, bufs, count, in_flags, ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast<int>(count); -@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, - else - out_flags = 0; - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvmsg(socket_type s, state_type state, -@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast<DWORD>(count); - DWORD bytes_transferred = 0; -@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = const_cast<buf*>(bufs); - msg.msg_iovlen = static_cast<int>(count); -@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_send(socket_type s, state_type state, const buf* bufs, -@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast<DWORD>(count); - DWORD bytes_transferred = 0; -@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast<int>(addrlen); -@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_sendto(socket_type s, state_type state, const buf* bufs, -@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, - WSA_FLAG_OVERLAPPED), ec); - if (s == invalid_socket) -@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type - } - ec = boost::asio::error::fault; - return socket_error_retval; --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - template <typename SockLenType> -@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad - return socket_error_retval; - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (cached) - { - // Check if socket is still connected. -@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad - ec = boost::system::error_code(); - return 0; - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - (void)cached; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - clear_last_error(); - int result = error_wrapper(call_getpeername( -@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); - #elif defined(__MACH__) && defined(__APPLE__) \ - || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd - fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (!readfds && !writefds && !exceptfds && timeout) - { - DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; -@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd - if (timeout && timeout->tv_sec == 0 - && timeout->tv_usec > 0 && timeout->tv_usec < 1000) - timeout->tv_usec = 1000; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) && defined(__SELECT) - timespec ts; -@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - } - -@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::address_family_not_supported; - return 0; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::invalid_argument; - - return result == socket_error_retval ? 0 : dest; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - const char* result = error_wrapper(::inet_ntop( - af, src, dest, static_cast<int>(length)), ec); - if (result == 0 && !ec) -@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void - strcat(dest, if_name); - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int inet_pton(int af, const char* src, void* dest, -@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v - ec = boost::asio::error::address_family_not_supported; - return -1; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy and strcmp. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v - ec = boost::system::error_code(); - - return result == socket_error_retval ? -1 : 1; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::inet_pton(af, src, dest), ec); - if (result <= 0 && !ec) - ec = boost::asio::error::invalid_argument; -@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v - } - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int gethostname(char* name, int namelen, boost::system::error_code& ec) -@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char - hostent* result, char* buffer, int buflength, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); -@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char - char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - (void)(ai_flags); -@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla - case EAI_SOCKTYPE: - return boost::asio::error::socket_type_not_supported; - default: // Possibly the non-portable EAI_SYSTEM. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return boost::system::error_code( - WSAGetLastError(), boost::asio::error::get_system_category()); - #else -@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co - host = (host && *host) ? host : 0; - service = (service && *service) ? service : 0; - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - int error = ::getaddrinfo(host, service, &hints, result); -@@ -3213,7 +3201,7 @@ boost::system::error_code background_get - - void freeaddrinfo(addrinfo_type* ai) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - ::freeaddrinfo(ai); -@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co - std::size_t addrlen, char* host, std::size_t hostlen, - char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - clear_last_error(); ---- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include <cstdlib> -@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() - #include <boost/asio/detail/pop_options.hpp> - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/socket_types.hpp> - #include <boost/asio/detail/winsock_init.hpp> -@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d - - #include <boost/asio/detail/pop_options.hpp> - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP ---- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/noncopyable.hpp> - #include <boost/asio/detail/socket_types.hpp> -@@ -54,6 +54,6 @@ private: - - #include <boost/asio/detail/pop_options.hpp> - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP ---- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_HAS_THREADS) \ - || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include <boost/asio/detail/noncopyable.hpp> -@@ -65,7 +64,6 @@ public: - #endif // !defined(BOOST_ASIO_HAS_THREADS) - // || defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP ---- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - // Guess whether we are building against on old Platform SDK. - #if !defined(IN6ADDR_ANY_INIT) -@@ -211,6 +211,6 @@ struct addrinfo_emulation - # define IPPROTO_ICMPV6 58 - #endif - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP ---- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS) - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -84,7 +83,6 @@ private: - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #endif // !defined(BOOST_ASIO_WINDOWS) - ---- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 -@@ -18,7 +18,6 @@ - #include <boost/asio/detail/config.hpp> - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(__CYGWIN__) \ - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include <cstring> -@@ -114,7 +113,6 @@ private: - #include <boost/asio/detail/pop_options.hpp> - - #endif // !defined(BOOST_ASIO_WINDOWS) -- // && !defined(__CYGWIN__) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 -@@ -18,8 +18,7 @@ - #include <boost/asio/detail/config.hpp> - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include <boost/asio/buffer.hpp> - #include <boost/asio/io_service.hpp> -@@ -319,6 +318,5 @@ private: - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 -@@ -19,7 +19,7 @@ - #include <boost/asio/detail/config.hpp> - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include <string> - #include <boost/asio/error.hpp> -@@ -230,7 +230,7 @@ private: - # include <boost/asio/detail/impl/reactive_serial_port_service.ipp> - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - # include <boost/asio/detail/socket_select_interrupter.hpp> - #elif defined(BOOST_ASIO_HAS_EVENTFD) - # include <boost/asio/detail/eventfd_select_interrupter.hpp> -@@ -31,7 +31,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - typedef socket_select_interrupter select_interrupter; - #elif defined(BOOST_ASIO_HAS_EVENTFD) - typedef eventfd_select_interrupter select_interrupter; ---- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 -@@ -51,13 +51,13 @@ class select_reactor - : public boost::asio::detail::service_base<select_reactor> - { - public: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 3, max_ops = 4 }; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 1, max_ops = 3 }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Per-descriptor data. - struct per_descriptor_data ---- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - # include <boost/asio/detail/null_signal_blocker.hpp> - #elif defined(BOOST_ASIO_HAS_PTHREADS) - # include <boost/asio/detail/posix_signal_blocker.hpp> -@@ -33,7 +33,7 @@ namespace detail { - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - typedef null_signal_blocker signal_blocker; - #elif defined(BOOST_ASIO_HAS_PTHREADS) - typedef posix_signal_blocker signal_blocker; ---- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include <csignal> - -@@ -44,6 +44,6 @@ public: - - #include <boost/asio/detail/pop_options.hpp> - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP ---- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 -@@ -28,9 +28,9 @@ - #include <boost/asio/detail/signal_op.hpp> - #include <boost/asio/detail/socket_types.hpp> - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include <boost/asio/detail/reactor.hpp> --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/push_options.hpp> - -@@ -183,8 +183,7 @@ private: - io_service_impl& io_service_; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // The type used for registering for pipe reactor notifications. - class pipe_read_op; - -@@ -195,7 +194,6 @@ private: - reactor::per_descriptor_data reactor_data_; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // A mapping from signal number to the registered signal sets. - registration* registrations_[max_signal_number]; ---- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 -@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ - BOOST_ASIO_DECL int listen(socket_type s, - int backlog, boost::system::error_code& ec); - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); - ---- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include <boost/asio/detail/socket_types.hpp> -@@ -85,7 +84,6 @@ private: - #endif // defined(BOOST_ASIO_HEADER_ONLY) - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 -@@ -19,7 +19,7 @@ - - #if defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Empty. --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) - # error WinSock.h has already been included - # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) -@@ -169,7 +169,7 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 - # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 - # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - typedef SOCKET socket_type; - const SOCKET invalid_socket = INVALID_SOCKET; - const int socket_error_retval = SOCKET_ERROR; ---- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/noncopyable.hpp> - #include <boost/asio/detail/reactor_op_queue.hpp> -@@ -146,6 +146,6 @@ private: - - #include <boost/asio/detail/pop_options.hpp> - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 -@@ -17,7 +17,7 @@ - - #include <boost/asio/detail/config.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/push_options.hpp> - -@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini - # include <boost/asio/detail/impl/winsock_init.ipp> - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP ---- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 -@@ -20,7 +20,6 @@ - #include <boost/system/error_code.hpp> - #include <boost/system/system_error.hpp> - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) - # include <winerror.h> - #else -@@ -45,7 +44,7 @@ - # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_NATIVE_ERROR(e) e - # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e - # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e -@@ -225,7 +224,7 @@ inline const boost::system::error_catego - return boost::system::system_category(); - } - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_netdb_category(); -@@ -233,7 +232,7 @@ const boost::system::error_category& get - extern BOOST_ASIO_DECL - const boost::system::error_category& get_addrinfo_category(); - --#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#else // !defined(BOOST_ASIO_WINDOWS) - - inline const boost::system::error_category& get_netdb_category() - { -@@ -245,7 +244,7 @@ inline const boost::system::error_catego - return get_system_category(); - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_misc_category(); ---- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 -@@ -25,7 +25,7 @@ namespace boost { - namespace asio { - namespace error { - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - -@@ -87,7 +87,7 @@ const boost::system::error_category& get - return instance; - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - ---- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 -@@ -27,7 +27,7 @@ - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios -@@ -41,7 +41,7 @@ namespace asio { - boost::system::error_code serial_port_base::baud_rate::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.BaudRate = value_; - #else - speed_t baud; -@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::baud_rate::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.BaudRate; - #else - speed_t baud = ::cfgetospeed(&storage); -@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con - boost::system::error_code serial_port_base::flow_control::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.fOutxCtsFlow = FALSE; - storage.fOutxDsrFlow = FALSE; - storage.fTXContinueOnXoff = TRUE; -@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::flow_control::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.fOutX && storage.fInX) - { - value_ = software; -@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ - boost::system::error_code serial_port_base::parity::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case none: -@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::parity::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.Parity == EVENPARITY) - { - value_ = even; -@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( - boost::system::error_code serial_port_base::stop_bits::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case one: -@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::stop_bits::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.StopBits == ONESTOPBIT) - { - value_ = one; -@@ -507,7 +507,7 @@ serial_port_base::character_size::charac - boost::system::error_code serial_port_base::character_size::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.ByteSize = value_; - #else - storage.c_cflag &= ~CSIZE; -@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::character_size::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.ByteSize; - #else - if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } ---- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 -@@ -24,7 +24,7 @@ - #include <boost/asio/detail/wrapped_handler.hpp> - #include <boost/system/error_code.hpp> - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include <boost/asio/detail/winsock_init.hpp> - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) -@@ -600,7 +600,7 @@ public: - friend bool has_service(io_service& ios); - - private: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - detail::winsock_init<> init_; - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) ---- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 -@@ -21,16 +21,16 @@ - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ - || defined(GENERATING_DOCUMENTATION) - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include <termios.h> --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include <boost/asio/detail/socket_types.hpp> - #include <boost/system/error_code.hpp> - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios ---- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 -@@ -85,15 +85,15 @@ public: - private: - static unsigned long openssl_id_func() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return ::GetCurrentThreadId(); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - void* id = instance()->thread_id_; - if (id == 0) - instance()->thread_id_ = id = &id; // Ugh. - BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); - return reinterpret_cast<unsigned long>(id); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - static void openssl_locking_func(int mode, int n, -@@ -109,10 +109,10 @@ private: - std::vector<boost::asio::detail::shared_ptr< - boost::asio::detail::mutex> > mutexes_; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // The thread identifiers to be used by openssl. - boost::asio::detail::tss_ptr<void> thread_id_; --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch deleted file mode 100644 index 97acc72689d28..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 -+++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 -@@ -39,18 +39,8 @@ - #define BOOST_HAS_STDINT_H - #endif - --/// Cygwin has no fenv.h --#define BOOST_NO_FENV_H -- - // boilerplate code: - #include <boost/config/posix_features.hpp> -- --// --// Cygwin lies about XSI conformance, there is no nl_types.h: --// --#ifdef BOOST_HAS_NL_TYPES_H --# undef BOOST_HAS_NL_TYPES_H --#endif - - - ---- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 -@@ -68,7 +68,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 -@@ -41,7 +41,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 -@@ -17,7 +17,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 -@@ -13,7 +13,7 @@ - #define BOOST_NO_STD_MESSAGES - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 -+++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 -@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) - defined(__CYGWIN__) \ - ) - # undef BOOST_OS_CYGWIN --# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE -+# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE - #endif - - #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch deleted file mode 100644 index 3d9726179be68..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch +++ /dev/null @@ -1,600 +0,0 @@ ---- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 -+++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 -@@ -29,6 +29,7 @@ local rule default_binary_format ( ) - local tmp = elf ; - if [ os.name ] = "MACOSX" { tmp = mach-o ; } - if [ os.name ] = "NT" { tmp = pe ; } -+ if [ os.name ] = "CYGWIN" { tmp = pe ; } - if [ os.name ] = "AIX" { tmp = xcoff ; } - return $(tmp) ; - } -@@ -581,6 +582,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_i386_ms_pe_gas.S -+ asm/jump_i386_ms_pe_gas.S -+ dummy.cpp -+ : <address-model>32 -+ <architecture>x86 -+ <binary-format>pe -+ <toolset>gcc -+ ; -+ -+alias asm_context_sources - : asm/make_i386_ms_pe_masm.asm - asm/jump_i386_ms_pe_masm.asm - dummy.cpp -@@ -715,6 +726,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_x86_64_ms_pe_gas.S -+ asm/jump_x86_64_ms_pe_gas.S -+ dummy.cpp -+ : <address-model>64 -+ <architecture>x86 -+ <binary-format>pe -+ <toolset>gcc -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp ---- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 -@@ -0,0 +1,108 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "jump_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _jump_fcontext -+.def _jump_fcontext; .scl 2; .type 32; .endef -+_jump_fcontext: -+ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ -+ movl %edi, (%ecx) /* save EDI */ -+ movl %esi, 0x04(%ecx) /* save ESI */ -+ movl %ebx, 0x08(%ecx) /* save EBX */ -+ movl %ebp, 0x0c(%ecx) /* save EBP */ -+ -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl (%edx), %eax /* load current SEH exception list */ -+ movl %eax, 0x24(%ecx) /* save current exception list */ -+ movl 0x04(%edx), %eax /* load current stack base */ -+ movl %eax, 0x18(%ecx) /* save current stack base */ -+ movl 0x08(%edx), %eax /* load current stack limit */ -+ movl %eax, 0x20(%ecx) /* save current stack limit */ -+ movl 0x10(%edx), %eax /* load fiber local storage */ -+ movl %eax, 0x28(%ecx) /* save fiber local storage */ -+ -+ leal 0x04(%esp), %eax /* exclude the return address */ -+ movl %eax, 0x10(%ecx) /* save as stack pointer */ -+ movl (%esp), %eax /* load return address */ -+ movl %eax, 0x14(%ecx) /* save return address */ -+ -+ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ -+ movl (%edx), %edi /* restore EDI */ -+ movl 0x04(%edx), %esi /* restore ESI */ -+ movl 0x08(%edx), %ebx /* restore EBX */ -+ movl 0x0c(%edx), %ebp /* restore EBP */ -+ -+ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ -+ testl %eax, %eax -+ je 1f -+ -+ stmxcsr 0x2c(%ecx) /* save MMX control word */ -+ fnstcw 0x30(%ecx) /* save x87 control word */ -+ ldmxcsr 0x2c(%edx) /* restore MMX control word */ -+ fldcw 0x30(%edx) /* restore x87 control word */ -+1: -+ movl %edx, %ecx -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl 0x24(%ecx), %eax /* load SEH exception list */ -+ movl %eax, (%edx) /* restore next SEH item */ -+ movl 0x18(%ecx), %eax /* load stack base */ -+ movl %eax, 0x04(%edx) /* restore stack base */ -+ movl 0x20(%ecx), %eax /* load stack limit */ -+ movl %eax, 0x08(%edx) /* restore stack limit */ -+ movl 0x28(%ecx), %eax /* load fiber local storage */ -+ movl %eax, 0x10(%edx) /* restore fiber local storage */ -+ -+ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ -+ -+ movl 0x10(%ecx), %esp /* restore ESP */ -+ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ -+ movl 0x14(%ecx), %ecx /* fetch the address to return to */ -+ -+ jmp *%ecx /* indirect jump to context */ ---- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 -@@ -0,0 +1,189 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "jump_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl jump_fcontext -+.def jump_fcontext; .scl 2; .type 32; .endef -+.seh_proc jump_fcontext -+jump_fcontext: -+.seh_endprologue -+ movq %r12, (%rcx) /* save R12 */ -+ movq %r13, 0x08(%rcx) /* save R13 */ -+ movq %r14, 0x10(%rcx) /* save R14 */ -+ movq %r15, 0x18(%rcx) /* save R15 */ -+ movq %rdi, 0x20(%rcx) /* save RDI */ -+ movq %rsi, 0x28(%rcx) /* save RSI */ -+ movq %rbx, 0x30(%rcx) /* save RBX */ -+ movq %rbp, 0x38(%rcx) /* save RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x08(%r10), %rax /* load current stack base */ -+ movq %rax, 0x50(%rcx) /* save current stack base */ -+ movq 0x10(%r10), %rax /* load current stack limit */ -+ movq %rax, 0x60(%rcx) /* save current stack limit */ -+ movq 0x18(%r10), %rax /* load fiber local storage */ -+ movq %rax, 0x68(%rcx) /* save fiber local storage */ -+ -+ testq %r9, %r9 -+ je 1f -+ -+ stmxcsr 0x70(%rcx) /* save MMX control and status word */ -+ fnstcw 0x74(%rcx) /* save x87 control word */ -+ /* save XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rcx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps %xmm6, (%r10) -+ movaps %xmm7, 0x10(%r10) -+ movaps %xmm8, 0x20(%r10) -+ movaps %xmm9, 0x30(%r10) -+ movaps %xmm10, 0x40(%r10) -+ movaps %xmm11, 0x50(%r10) -+ movaps %xmm12, 0x60(%r10) -+ movaps %xmm13, 0x70(%r10) -+ movaps %xmm14, 0x80(%r10) -+ movaps %xmm15, 0x90(%r10) -+ -+ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ -+ fldcw 0x74(%rdx) /* restore x87 control word */ -+ /* restore XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rdx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps (%r10), %xmm6 -+ movaps 0x10(%r10), %xmm7 -+ movaps 0x20(%r10), %xmm8 -+ movaps 0x30(%r10), %xmm9 -+ movaps 0x40(%r10), %xmm10 -+ movaps 0x50(%r10), %xmm11 -+ movaps 0x60(%r10), %xmm12 -+ movaps 0x70(%r10), %xmm13 -+ movaps 0x80(%r10), %xmm14 -+ movaps 0x90(%r10), %xmm15 -+ -+1: -+ leaq 0x08(%rsp), %rax /* exclude the return address */ -+ movq %rax, 0x40(%rcx) /* save as stack pointer */ -+ movq (%rsp), %rax /* load return address */ -+ movq %rax, 0x48(%rcx) /* save return address */ -+ -+ movq (%rdx), %r12 /* restore R12 */ -+ movq 0x08(%rdx), %r13 /* restore R13 */ -+ movq 0x10(%rdx), %r14 /* restore R14 */ -+ movq 0x18(%rdx), %r15 /* restore R15 */ -+ movq 0x20(%rdx), %rdi /* restore RDI */ -+ movq 0x28(%rdx), %rsi /* restore RSI */ -+ movq 0x30(%rdx), %rbx /* restore RBX */ -+ movq 0x38(%rdx), %rbp /* restore RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x50(%rdx), %rax /* load stack base */ -+ movq %rax, 0x08(%r10) /* restore stack base */ -+ movq 0x60(%rdx), %rax /* load stack limit */ -+ movq %rax, 0x10(%r10) /* restore stack limit */ -+ movq 0x68(%rdx), %rax /* load fiber local storage */ -+ movq %rax, 0x18(%r10) /* restore fiber local storage */ -+ -+ movq 0x40(%rdx), %rsp /* restore RSP */ -+ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ -+ -+ movq %r8, %rax /* use third arg as return value after jump */ -+ movq %r8, %rcx /* use third arg as first arg in context function */ -+ -+ jmp *%r10 /* indirect jump to caller */ -+.seh_endproc ---- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 -@@ -0,0 +1,115 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "make_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _make_fcontext -+.def _make_fcontext; .scl 2; .type 32; .endef -+_make_fcontext: -+ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in EAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andl $-16, %eax -+ -+ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ -+ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ -+ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ -+ negl %edx /* negate stack size for LEA instruction (== substraction) */ -+ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ -+ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ -+ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ -+ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ -+ -+ stmxcsr 0x02c(%eax) /* save MMX control word */ -+ fnstcw 0x030(%eax) /* save x87 control word */ -+ -+ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ -+ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ -+ -+ movl $finish, %ecx /* abs address of finish */ -+ movl %ecx, (%edx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ /* traverse current seh chain to get the last exception handler installed by Windows */ -+ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ -+ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ -+ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ -+ /* program is aborted */ -+ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ -+ -+walk: -+ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ -+ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ -+ jz found -+ decl %edx -+ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ -+ jmp walk /* inspect next SEH */ -+ -+found: -+ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ -+ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ -+ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ -+ movl $0xffffffff,%ecx /* set ECX to -1 */ -+ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ -+ leal 0x14(%edx), %ecx /* load address of next SEH item */ -+ movl %ecx, 0x24(%eax) /* save next SEH */ -+ -+ ret -+ -+finish: -+ /* ESP points to same address as ESP on entry of context function + 0x4 */ -+ xorl %eax, %eax -+ movl %eax, (%esp) /* exit code is zero */ -+ call __exit /* exit application */ -+ hlt -+ -+.def __exit; .scl 2; .type 32; .endef /* standard C library function */ ---- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 -@@ -0,0 +1,132 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "make_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl make_fcontext -+.def make_fcontext; .scl 2; .type 32; .endef -+.seh_proc make_fcontext -+make_fcontext: -+.seh_endprologue -+ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in RAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andq $-16, %rax -+ -+ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ -+ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ -+ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ -+ -+ negq %rdx /* negate stack size for LEA instruction (== substraction) */ -+ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ -+ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ -+ -+ stmxcsr 0x70(%rax) /* save MMX control and status word */ -+ fnstcw 0x74(%rax) /* save x87 control word */ -+ -+ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ -+ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ -+ -+ leaq finish(%rip),%rcx /* compute abs address of label finish */ -+ movq %rcx,(%rdx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ ret -+ -+finish: -+ /* RSP points to same address as RSP on entry of context function + 0x8 */ -+ xorq %rcx, %rcx /* exit code is zero */ -+ call _exit /* exit application */ -+ hlt -+.seh_endproc -+ -+.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch deleted file mode 100644 index cbb5757746da1..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 -@@ -1966,8 +1966,7 @@ namespace - { - errno = 0; - --# if !defined(__CYGWIN__)\ -- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ -+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ - && defined(_SC_THREAD_SAFE_FUNCTIONS)\ - && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ - && (!defined(__hpux) || defined(_REENTRANT)) \ ---- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 -@@ -36,7 +36,7 @@ - # include "windows_file_codecvt.hpp" - # include <windows.h> - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OPEN_BSD__) -+ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) - # include <boost/filesystem/detail/utf8_codecvt_facet.hpp> - #endif - -@@ -831,7 +831,7 @@ namespace - std::locale global_loc = std::locale(); - return std::locale(global_loc, new windows_file_codecvt); - # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OpenBSD__) -+ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." See - // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch deleted file mode 100644 index 16208385a9b95..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 -@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla - - } - -- if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) && ! <target-os>cygwin in $(properties) -+ if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) - { - ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; - result += <build>no ; -@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla - if ! <boost.locale.winapi> in $(properties:G) - { - if <target-os>windows in $(properties) -- || <target-os>cygwin in $(properties) - { - properties += <boost.locale.winapi>on ; - } -@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla - } - - if ( ! <boost.locale.winapi>off in $(properties) || ! <boost.locale.std>off in $(properties) ) -- && ( <target-os>windows in $(properties) || <target-os>cygwin in $(properties) ) -+ && <target-os>windows in $(properties) - { - result += <source>win32/lcid.cpp ; - } ---- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 -@@ -8,7 +8,7 @@ - #define BOOST_LOCALE_SOURCE - #include <boost/config.hpp> - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #define BOOST_LOCALE_WITH_WCONV - #endif - ---- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 -@@ -59,7 +59,7 @@ namespace boost { - return normalize_encoding(l).compare(normalize_encoding(r)); - } - -- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+ #if defined(BOOST_WINDOWS) - int encoding_to_windows_codepage(char const *ccharset); - #endif - ---- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 -@@ -15,7 +15,7 @@ - # pragma warning(disable : 4996) - #endif - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #ifndef NOMINMAX - #define NOMINMAX - #endif ---- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 -@@ -23,7 +23,7 @@ - # include <locale.h> - #endif - --#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - #ifndef NOMINMAX - # define NOMINMAX - #endif -@@ -395,7 +395,7 @@ int main() - def.push_back("posix"); - #endif - -- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - test_iso_8859_8 = IsValidCodePage(28598)!=0; - #endif - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch deleted file mode 100644 index a7748ec58d827..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 -@@ -96,11 +96,6 @@ - # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS - #endif - --#if defined(__CYGWIN__) -- // Boost.ASIO is broken on Cygwin --# define BOOST_LOG_NO_ASIO --#endif -- - #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) - # ifndef BOOST_LOG_WITHOUT_SYSLOG - # define BOOST_LOG_WITHOUT_SYSLOG ---- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 -@@ -170,10 +170,6 @@ project boost/log - <target-os>windows:<library>ws2_32 - <target-os>windows:<library>mswsock - -- <target-os>cygwin:<define>__USE_W32_SOCKETS -- <target-os>cygwin:<library>ws2_32 -- <target-os>cygwin:<library>mswsock -- - <target-os>linux:<library>rt - <target-os>linux:<define>_XOPEN_SOURCE=600 - <target-os>linux:<define>_GNU_SOURCE=1 ---- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 -@@ -18,7 +18,7 @@ - - #include <boost/log/detail/config.hpp> - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - - #if defined(BOOST_LOG_USE_WINNT6_API) - -@@ -50,6 +50,6 @@ - #define WIN32_LEAN_AND_MEAN - #endif - --#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_WINDOWS) - - #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch deleted file mode 100644 index 35e6905b0f332..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 -@@ -79,7 +79,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include <boost/smart_ptr/detail/atomic_count_sync.hpp> - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include <boost/smart_ptr/detail/atomic_count_win32.hpp> - - #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) ---- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 -@@ -32,7 +32,7 @@ - # include <boost/smart_ptr/detail/lwm_nop.hpp> - #elif defined(BOOST_HAS_PTHREADS) - # include <boost/smart_ptr/detail/lwm_pthreads.hpp> --#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include <boost/smart_ptr/detail/lwm_win32_cs.hpp> - #else - // Use #define BOOST_DISABLE_THREADS to avoid the error ---- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 -@@ -65,7 +65,7 @@ - #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) - # include <boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp> - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - # include <boost/smart_ptr/detail/sp_counted_base_w32.hpp> - - #elif defined( _AIX ) ---- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 -@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch - # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange - # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - namespace boost - { ---- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 -@@ -49,7 +49,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include <boost/smart_ptr/detail/spinlock_sync.hpp> - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include <boost/smart_ptr/detail/spinlock_w32.hpp> - - #elif defined(BOOST_HAS_PTHREADS) ---- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 -@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); - - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #if defined( BOOST_USE_WINDOWS_H ) - # include <windows.h> ---- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 -@@ -8,7 +8,7 @@ - // http://www.boost.org/LICENSE_1_0.txt - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #include <boost/smart_ptr/detail/sp_interlocked.hpp> - #include <boost/detail/lightweight_test.hpp> diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch deleted file mode 100644 index e241f37f20362..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 -@@ -33,7 +33,7 @@ - // Standalone MinGW and all other known Windows compilers do predefine _WIN32 - // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. - --# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin -+# if defined(_WIN32) // Windows default, including MinGW and Cygwin - # define BOOST_WINDOWS_API - # else - # define BOOST_POSIX_API ---- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 -@@ -97,7 +97,7 @@ namespace - char buf[64]; - char * bp = buf; - std::size_t sz = sizeof(buf); -- # if defined(__CYGWIN__) || defined(__USE_GNU) -+ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) - // Oddball version of strerror_r - const char * c_str = strerror_r( ev, bp, sz ); - return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch deleted file mode 100644 index b60a3ac49d3c2..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp -index 8b2bc43..d04f2fe 100644 ---- a/libs/units/example/autoprefixes.cpp -+++ b/libs/units/example/autoprefixes.cpp -@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units:: - struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5> - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return("€"); } -+ static const char* symbol() { return("€"); } - }; - - int main() -@@ -140,7 +140,7 @@ int main() - - quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ - - - return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch deleted file mode 100644 index 15ce4007675da..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- a/boost/pool/pool.hpp (revision 78317) -+++ b/boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include <boost/pool/poolfwd.hpp> - -+// std::numeric_limits -+#include <boost/limits.hpp> - // boost::math::static_lcm - #include <boost/math/common_factor_ct.hpp> -@@ -358,4 +360,13 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); -+ size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); -+ -+ return max_chunks; -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -400,7 +413,7 @@ - } - void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -410,5 +423,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -797,4 +811,6 @@ - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- a/libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) -@@ -0,0 +1,27 @@ -+/* Copyright (C) 2012 Étienne Dupuis -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include <boost/pool/object_pool.hpp> -+#include <boost/limits.hpp> -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch deleted file mode 100644 index b7c91284d9bb0..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp ---- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 -+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 -@@ -27,7 +27,6 @@ namespace boundary { - int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) - { - typedef LeftIterator left_iterator; -- typedef RightIterator right_iterator; - typedef typename std::iterator_traits<left_iterator>::value_type char_type; - typedef std::char_traits<char_type> traits; - while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch deleted file mode 100644 index 6c1d0a021ed16..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp ---- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 -+++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 -@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ - { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. - size_type partition_size = alloc_size(); - size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); -- size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); -- -- return max_chunks; -+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); - } - - static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch deleted file mode 100644 index 8adf8ed2080d9..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp ---- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 -+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 -@@ -147,8 +147,8 @@ namespace detail - template <class T> - inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const - { -- typedef converter::registered<argument_type> r; - # if BOOST_WORKAROUND(__GNUC__, < 3) -+ typedef converter::registered<argument_type> r; - // suppresses an ICE, somehow - (void)r::converters; - # endif - -Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch deleted file mode 100644 index cf9756e40ea49..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ./move/core.hpp~ ./move/core.hpp ---- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 -+++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 -@@ -43,6 +43,7 @@ - #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) - - #include <boost/move/detail/meta_utils.hpp> -+ #include <boost/type_traits/is_class.hpp> - - //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers - #if defined(__GNUC__) && (__GNUC__ >= 4) && \ -@@ -65,7 +66,7 @@ - template <class T> - class rv - : public ::boost::move_detail::if_c -- < ::boost::move_detail::is_class_or_union<T>::value -+ < ::boost::is_class<T>::value - , T - , ::boost::move_detail::nat - >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch deleted file mode 100644 index 561cef19eb23f..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp ---- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 -+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 -@@ -52,16 +52,15 @@ struct print - enum { n = sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else -- enum { -- n = --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned<T>::value > -1 --# else -- sizeof(T) > -1 --# endif -- }; --#endif -+#elif defined(__EDG_VERSION__) -+ enum { n = aux::dependent_unsigned<T>::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n = n1 != n2 }; -+#else -+ enum { n = sizeof(T) > -1 }; -+#endif - }; - - #if defined(BOOST_MSVC) - -Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch deleted file mode 100644 index 57e6206bba155..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 -@@ -28,17 +28,17 @@ explicit valgrind_config_check ; - local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : <testing.launcher>"valgrind --error-exitcode=1" : <build>no ] ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp ] -- [ run test_pool_alloc.cpp ] -- [ run pool_msvc_compiler_bug_test.cpp ] -- [ run test_msvc_mem_leak_detect.cpp ] -- [ run test_bug_3349.cpp ] -- [ run test_bug_4960.cpp ] -- [ run test_bug_1252.cpp ] -- [ run test_bug_2696.cpp ] -- [ run test_bug_5526.cpp ] -+ [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ] - [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ] -- [ run ../example/time_pool_alloc.cpp ] -+ [ run ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ] - [ compile test_poisoned_macros.cpp ] - - # - -Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch deleted file mode 100644 index eb9ea14011ff6..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/boost/signals2/trackable.hpp -+++ b/boost/signals2/trackable.hpp -@@ -18,6 +18,7 @@ - - #include <boost/assert.hpp> - #include <boost/shared_ptr.hpp> -+#include <boost/weak_ptr.hpp> - - namespace boost { - namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch deleted file mode 100644 index 282962987c59f..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 -@@ -282,12 +282,12 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base<GrammarT> helper_base_t; - typedef grammar_helper_list<GrammarT> helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - grammartract_helper_list::do_(self); - - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else - -Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch deleted file mode 100644 index 30ebb981b70b1..0000000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/boost/uuid/detail/uuid_x86.hpp -+++ b/boost/uuid/detail/uuid_x86.hpp -@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT - cmp = (cmp - 1u) ^ cmp; - rcmp = (rcmp - 1u) ^ rcmp; - -- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); -+ return cmp < rcmp; - } - - } // namespace uuids diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 4e228f8f43254..161d85b02bfd0 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch"; sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw"; }) + # PR24 + (fetchpatch { + name = "fix-narrow-term-crash.patch"; + url = https://github.com/troglobit/editline/pull/24/commits/8660aef4b795fbd46a86dca804f067a81757c5df.patch; + sha256 = "0pcz1f141qv78xbq09yh0zfcjiqyavr66snz1hvxzvi8x0vixc4i"; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch index feb46021f8c73..9eb53acebb0a8 100644 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index f826864..8b8a25e 100644 +index c189753..12c10cb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ if get_option('enable-backend') @@ -11,7 +11,16 @@ index f826864..8b8a25e 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -26,7 +26,7 @@ if get_option('enable-backend') +@@ -16,7 +16,7 @@ if get_option('enable-backend') + conf = configuration_data() + conf.set('libexecdir', libexecdir) + conf.set('dbus_srv_user', get_option('dbus-srv-user')) +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + service_dir = join_paths(datadir, 'dbus-1', 'system-services') + configure_file(output: 'org.freedesktop.GeoClue2.service', +@@ -33,7 +33,7 @@ if get_option('enable-backend') # DBus Service policy file dbus_service_dir = get_option('dbus-sys-dir') if dbus_service_dir == '' @@ -21,10 +30,10 @@ index f826864..8b8a25e 100644 configure_file(output: 'org.freedesktop.GeoClue2.conf', input: 'org.freedesktop.GeoClue2.conf.in', diff --git a/demo/meson.build b/demo/meson.build -index 99c094f..a29ca96 100644 +index 1427fbe..2623f16 100644 --- a/demo/meson.build +++ b/demo/meson.build -@@ -56,7 +56,7 @@ if get_option('demo-agent') +@@ -54,7 +54,7 @@ if get_option('demo-agent') install_dir: desktop_dir) # Also install in the autostart directory. @@ -34,7 +43,7 @@ index 99c094f..a29ca96 100644 desktop_file.full_path(), autostart_dir) diff --git a/meson.build b/meson.build -index d738ef6..c794a1d 100644 +index fde6fa3..39b7b0a 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,11 @@ gclue_api_version='2.0' @@ -50,8 +59,8 @@ index d738ef6..c794a1d 100644 localedir = join_paths(datadir, 'locale') header_dir = 'libgeoclue-' + gclue_api_version -@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'http://www.freedesktop.org/wiki/Software/GeoClue - conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugs.freedesktop.org/enter_bug.cgi?product=GeoClue') +@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w + conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/') conf.set_quoted('LOCALEDIR', localedir) -conf.set_quoted('SYSCONFDIR', sysconfdir) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 5b8951cb3e076..70319c9151f5f 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = version; - sha256 = "1zk6n28q030a9v03whad928b9zwq16d30ch369qv2c0994axdr5p"; + sha256 = "1wbpi74dw3p7izxwd57irz2i1g55r7wzl5h2yf0ns0hgq2njdfsg"; }; patches = [ diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch new file mode 100644 index 0000000000000..d6a441e1577c7 --- /dev/null +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -0,0 +1,79 @@ +From c550bf4a41e9f86351b0a65ea3d6c9ab616e27c0 Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Thu, 16 May 2019 21:15:15 -0400 +Subject: [PATCH] meson: add options for tests installation dirs + +--- + meson_options.txt | 6 ++++++ + src/tests/meson.build | 19 ++++++++++++++----- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index c938805..c1e9e95 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -19,6 +19,12 @@ option('arm_neon', type: 'boolean', + option('tests', type: 'boolean', + value: true, + description: 'Build the test suite (requires GObject)') ++option('installed_test_datadir', type: 'string', ++ value: '', ++ description: 'Installation directory for data files in tests') ++option('installed_test_bindir', type: 'string', ++ value: '', ++ description: 'Installation directory for binary files in tests') + option('benchmarks', type: 'boolean', + value: true, + description: 'Build the benchmarks suite (requires GObject)') +diff --git a/src/tests/meson.build b/src/tests/meson.build +index 62129c6..0186400 100644 +--- a/src/tests/meson.build ++++ b/src/tests/meson.build +@@ -22,8 +22,17 @@ unit_tests = [ + python = python3.find_python() + gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') + +-installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) +-installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) ++test_suffix = join_paths('installed-tests', graphene_api_path) ++ ++test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix) ++if test_datadir == '' ++ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix) ++endif ++ ++test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix) ++if test_bindir == '' ++ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix) ++endif + + foreach unit: unit_tests + wrapper = '@0@.test'.format(unit) +@@ -32,13 +41,13 @@ foreach unit: unit_tests + command: [ + python, + gen_installed_test, +- '--testdir=@0@'.format(installed_test_bindir), ++ '--testdir=@0@'.format(test_bindir), + '--testname=@0@'.format(unit), + '--outdir=@OUTDIR@', + '--outfile=@0@'.format(wrapper), + ], + install: true, +- install_dir: installed_test_datadir) ++ install_dir: test_datadir) + + exe = executable(unit, unit + '.c', + dependencies: graphene_dep, +@@ -50,7 +59,7 @@ foreach unit: unit_tests + '-DGLIB_DISABLE_DEPRECATION_WARNINGS', + ], + install: true, +- install_dir: installed_test_bindir) ++ install_dir: test_bindir) + + test(unit, exe, args: [ '--tap', '-k' ]) + endforeach +-- +2.21.0 + diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix new file mode 100644 index 0000000000000..253fce4ea0daa --- /dev/null +++ b/pkgs/development/libraries/graphene/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, python3 +, glib +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "graphene"; + version = "1.8.6"; + + outputs = [ "out" "devdoc" "installedTests" ]; + + src = fetchFromGitHub { + owner = "ebassi"; + repo = pname; + rev = version; + sha256 = "1hdbdzcz86jrvsq5h954ph9q62m8jr2a5s5acklxhdkfqn5bkbv8"; + }; + + patches = [ + ./0001-meson-add-options-for-tests-installation-dirs.patch + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" + "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" + ]; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gtk-doc + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + gobject-introspection + ]; + + checkInputs = [ + glib + ]; + + meta = with stdenv.lib; { + description = "A thin layer of graphic data types"; + homepage = "https://ebassi.github.com/graphene"; + license = licenses.mit; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/herqq/gcc6.patch b/pkgs/development/libraries/herqq/gcc6.patch deleted file mode 100644 index b0f7d8d0c6faf..0000000000000 --- a/pkgs/development/libraries/herqq/gcc6.patch +++ /dev/null @@ -1,1320 +0,0 @@ -diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -index c4d2ebe..707dbdb 100644 ---- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -+++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged( - { - foreach(const HAvtLastChangeInfo& info, infos) - { -- if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0) -+ if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0) - { - HTransportState state(info.value().toString()); - if (state.isValid()) -diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -index 40f9fda..6739a58 100644 ---- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -+++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const - { - QString vrs = version(); - -- return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) && -+ return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) && - (vrs.size() == 3 && - (vrs[0] == '1') && - vrs[1] == '.' && -@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const - { - QString vrs = version(); - -- bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 && -+ bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 && - vrs.size() >= 3 && - vrs[0] == '1' && - vrs[1] == '.'; -diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp -index 8ed2492..94ab1e0 100644 ---- c/herqq/hupnp/src/dataelements/hresourcetype.cpp -+++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp -@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - { - return; - } -- if (tmp[1].compare("schemas-upnp-org") != 0) -+ if (tmp[1].compare(QString("schemas-upnp-org")) != 0) - { - flags = 0x01; - tmp[1] = tmp[1].replace('.', '-'); -@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - } - - tmp[2] = tmp[2].simplified(); -- if (tmp[2].compare("device") == 0) -+ if (tmp[2].compare(QString("device")) == 0) - { - flags |= 0x04; - } -- else if (tmp[2].compare("service") == 0) -+ else if (tmp[2].compare(QString("service")) == 0) - { - flags |= 0x08; - } -diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp -index 9b0fad6..11a8640 100644 ---- c/herqq/hupnp/src/dataelements/hserviceid.cpp -+++ i/herqq/hupnp/src/dataelements/hserviceid.cpp -@@ -64,7 +64,7 @@ public: - return; - } - -- if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0) -+ if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD( - QString("Invalid service identifier [%1]").arg(arg)); -@@ -72,7 +72,7 @@ public: - return; - } - -- if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0) -+ if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0) - { - tmp[1] = tmp[1].replace('.', '-'); - if (tmp[1].isEmpty()) -@@ -85,7 +85,7 @@ public: - } - - bool warned = false; -- if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0) -+ if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg)); - warned = true; -diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -index b3a58fa..d1853e1 100644 ---- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -+++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments( - } - - HActionArgument createdArg; -- if (dirStr.compare("out", Qt::CaseInsensitive) == 0) -+ if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0) - { - if (retValWasDefined) - { -@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments( - - outArgs->push_back(createdArg); - } -- else if (dirStr.compare("in", Qt::CaseInsensitive) == 0) -+ else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0) - { - if (firstOutArgFound) - { -@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable( - - QString strSendEvents = stateVariableElement.attribute("sendEvents", "no"); - bool bSendEvents = false; -- if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bSendEvents = true; - } -- else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable( - - QString strMulticast = stateVariableElement.attribute("multicast", "no"); - bool bMulticast = false; -- if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bMulticast = true; - } -- else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -index 2e375a0..2d6a8cc 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents( - - // this appears to be an initial subscription - -- if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0) -+ if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0) - { - return PreConditionFailed; - } -diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -index aacdfcf..b618ba7 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; -@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; - } - -- if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0) -+ if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0) - { - m_subTypeValue.first = SubType_UpnpPropChange; - m_subTypeValue.second = "upnp:propchange"; -diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -index 0faf7f4..addbaaf 100644 ---- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) : - m_value(-1) - { - QString tmp(timeout.simplified()); -- if (tmp.compare("infinite", Qt::CaseInsensitive) != 0) -+ if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0) - { - if (tmp.startsWith("Second-", Qt::CaseInsensitive)) - { -diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp -index 9f2084f..ae8e9ae 100644 ---- c/herqq/hupnp/src/general/hupnp_datatypes.cpp -+++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp -@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType( - - case HUpnpDataTypes::boolean: - { -- if (value.compare("true", Qt::CaseInsensitive) == 0 || -- value.compare("yes", Qt::CaseInsensitive) == 0 || -- value.compare("1") == 0) -+ if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("yes"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("1")) == 0) - { - retVal = true; - } -- else if (value.compare("false", Qt::CaseInsensitive) == 0 || -- value.compare("no", Qt::CaseInsensitive) == 0 || -- value.compare("0") == 0) -+ else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("no"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("0")) == 0) - { - retVal = false; - } -diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp -index eb1a56c..42e93ca 100644 ---- c/herqq/hupnp/src/http/hhttp_server_p.cpp -+++ i/herqq/hupnp/src/http/hhttp_server_p.cpp -@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op) - mi->setKeepAlive(HHttpUtils::keepAlive(*hdr)); - - QString method = hdr->method(); -- if (method.compare("GET", Qt::CaseInsensitive) == 0) -+ if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0) - { - processGet(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("HEAD"), Qt::CaseInsensitive) -+ else if (method.compare(QString("HEAD")), Qt::CaseInsensitive) - { - processHead(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("POST", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0) - { - processPost(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0) - { - processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processSubscription(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processUnsubscription(op->takeMessagingInfo(), *hdr); - } -diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h -index 7285190..b3ee62e 100644 ---- c/herqq/hupnp/src/http/hhttp_utils_p.h -+++ i/herqq/hupnp/src/http/hhttp_utils_p.h -@@ -64,10 +64,10 @@ public: - QString connection = hdr.value("CONNECTION"); - if (hdr.minorVersion() == 1) - { -- return connection.compare("close", Qt::CaseInsensitive) != 0; -+ return connection.compare(QString("close"), Qt::CaseInsensitive) != 0; - } - -- return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0; -+ return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0; - } - - // returns the URLs as a string inside brackets. This is the format used in -diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -index 6641d14..7ea567a 100644 ---- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp -+++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok) - bool retVal = false, match = true; - if (arg == "1") { retVal = true; } - else if (arg == "0") { retVal = false; } -- else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal = false; } -- else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; } - else { match = false; } - - if (ok) { *ok = match; } -diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -index 6531929..8bd05c5 100644 ---- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -+++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status) - HObject::WriteStatus HObject::writeStatusFromString(const QString& status) - { - WriteStatus retVal = UnknownWriteStatus; -- if (status.compare("writable", Qt::CaseInsensitive) == 0) -+ if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0) - { - retVal = WritableWriteStatus; - } -- else if (status.compare("protected", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0) - { - retVal = ProtectedWriteStatus; - } -- else if (status.compare("mixed", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0) - { - retVal = MixedWriteStatus; - } -diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -index 25ee560..bea6ece 100644 ---- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -+++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type) - HMatchingId::Type HMatchingId::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0) - { - retVal = SeriesId; - } -- else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0) - { - retVal = ProgramId; - } -diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -index 06ab6bf..e7cec20 100644 ---- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -+++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type) - HScheduledTime::Type HScheduledTime::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0) - { - retVal = ScheduledProgram; - } -- else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0) - { - retVal = OnDemand; - } -diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -index 078d719..31e1af0 100644 ---- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -+++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type) - HSortModifier::Type HSortModifier::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("+", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByValue; - } -- else if (type.compare("-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByValue; - } -- else if (type.compare("TIME+", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByTime; - } -- else if (type.compare("TIME-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByTime; - } -diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -index 65b67f8..f51e6b2 100644 ---- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -+++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString( - const QString& type) - { - RcsInstanceType retVal = Undefined; -- if (type.compare("pre-mix", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PreMix; - } -- else if (type.compare("post-mix", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PostMix; - } -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -index 9f5712d..cd4dacb 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml( - addNamespaces(reader); - if (reader.readNextStartElement()) - { -- if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0) - { - h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element"; - return false; -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -index 30af243..af03c5c 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn( - - if (stateVariableReader.readNextStartElement()) - { -- if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return false; - } -diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp -index d35a559..85b7e32 100644 ---- c/herqq/hupnp_av/src/common/hradioband.cpp -+++ i/herqq/hupnp_av/src/common/hradioband.cpp -@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type) - HRadioBand::Type HRadioBand::fromString(const QString& arg) - { - Type retVal = Undefined; -- if (arg.compare("am", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0) - { - retVal = AM; - } -- else if (arg.compare("fm", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0) - { - retVal = FM; - } -- else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0) - { - retVal = ShortWave; - } -- else if (arg.compare("internet", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0) - { - retVal = Internet; - } -- else if (arg.compare("satellite", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0) - { - retVal = Satellite; - } -diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp -index 37ab7e0..c7f2109 100644 ---- c/herqq/hupnp_av/src/common/hstoragemedium.cpp -+++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp -@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type) - HStorageMedium::Type HStorageMedium::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = Unknown; - } -- else if (type.compare("DV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0) - { - retVal = DigitalVideo; - } -- else if (type.compare("VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0) - { - retVal = VHS; - } -- else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = W_VHS; - } -- else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = S_VHS; - } -- else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0) - { - retVal = D_VHS; - } -- else if (type.compare("VHSC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0) - { - retVal = VHSC; - } -- else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0) - { - retVal = Video8; - } -- else if (type.compare("HI8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0) - { - retVal = HI8; - } -- else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = CD_ROM; - } -- else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0) - { - retVal = CD_DA; - } -- else if (type.compare("CD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0) - { - retVal = CD_R; - } -- else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = CD_RW; - } -- else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0) - { - retVal = Video_CD; - } -- else if (type.compare("SACD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0) - { - retVal = SACD; - } -- else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscAudio; - } -- else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscPicture; - } -- else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_ROM; - } -- else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_Video; - } -- else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRecordable; - } -- else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRecordable; - } -- else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRewritable; - } -- else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRewritable; - } -- else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_RAM; - } -- else if (type.compare("DAT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0) - { - retVal = DAT; - } -- else if (type.compare("LD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0) - { - retVal = LD; - } -- else if (type.compare("HDD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0) - { - retVal = HDD; - } -- else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0) - { - retVal = MicroMV; - } -- else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0) - { - retVal = Network; - } -- else if (type.compare("NONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0) - { - retVal = None; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = SecureDigital; - } -- else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0) - { - retVal = PC_Card; - } -- else if (type.compare("MMC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0) - { - retVal = MultimediaCard; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CompactFlash; - } -- else if (type.compare("BD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0) - { - retVal = BluRay; - } -- else if (type.compare("MS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0) - { - retVal = MemoryStick; - } -- else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0) - { - retVal = HD_DVD; - } -diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -index 89d44ae..bb364b5 100644 ---- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -+++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction - HConnectionManagerInfo::directionFromString(const QString& arg) - { - Direction retVal = DirectionUndefined; -- if (arg.compare("Input", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionInput; - } -- else if (arg.compare("Output", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionOutput; - } -@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus - HConnectionManagerInfo::statusFromString(const QString& arg) - { - ConnectionStatus retVal = StatusUnknown; -- if (arg.compare("Ok", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0) - { - retVal = StatusOk; - } -- else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnknown; - } -- else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0) - { - retVal = StatusContentFormatMismatch; - } -- else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0) - { - retVal = StatusInsufficientBandwidth; - } -- else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnreliableChannel; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -index 5c0c0d0..743ed1e 100644 ---- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag - HContentDirectoryInfo::browseFlagFromString(const QString& arg) - { - BrowseFlag retVal = Undefined; -- if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseMetadata; - } -- else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseDirectChildren; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -index 0a663dc..1771b6f 100644 ---- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo() - HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg) - { - Status retVal = Error; -- if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0) - { - retVal = InProgress; - } -- else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0) - { - retVal = Completed; - } -diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp -index c3f93a9..27d98a0 100644 ---- c/herqq/hupnp_av/src/hav_global.cpp -+++ i/herqq/hupnp_av/src/hav_global.cpp -@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg) - addNamespaces(reader); - - if (!reader.readNextStartElement() || -- reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return retVal; - } -diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -index f9e2dc4..69b7648 100644 ---- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -+++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0) - { - return; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -index 651e727..9fb4958 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived( - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -index 174f423..bf7e9f2 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection( - return HConnectionManagerInfo::IncompatibleDirections; - } - -- if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) && -+ if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) && - remoteProtocolInfo.protocol() != "*") - { - return HConnectionManagerInfo::IncompatibleProtocolInfo; -diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -index 1ad337a..0f5e209 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName) - { - bool retVal = false; - QString trimmed = svName.trimmed(); -- if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0) -+ if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -index a614e17..fbb3258 100644 ---- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables( - foreach(QString svName, stateVarNames) - { - svName = svName.trimmed(); -- if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 || -+ if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 || - svName.startsWith("A_ARG", Qt::CaseInsensitive)) - { - return HAvTransportInfo::InvalidStateVariableList; -@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -index 751a3d9..51c1ff4 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -@@ -110,59 +110,59 @@ QString HChannel::toString(Type type) - HChannel::Type HChannel::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("MASTER", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0) - { - retVal = Master; - } -- else if (type.compare("LF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0) - { - retVal = LeftFront; - } -- else if (type.compare("RF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0) - { - retVal = RightFront; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CenterFront; - } -- else if (type.compare("LFE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0) - { - retVal = LFE; - } -- else if (type.compare("LS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0) - { - retVal = LeftSurround; - } -- else if (type.compare("RS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0) - { - retVal = RightSurround; - } -- else if (type.compare("LFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0) - { - retVal = LeftOfCenter; - } -- else if (type.compare("RFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0) - { - retVal = RightOfCenter; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = Surround; - } -- else if (type.compare("SL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0) - { - retVal = SideLeft; - } -- else if (type.compare("SR", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0) - { - retVal = SideRight; - } -- else if (type.compare("T", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0) - { - retVal = Top; - } -- else if (type.compare("B", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0) - { - retVal = Bottom; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -index fd52f9a..84f5579 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp -index cb18ce0..e3fcd64 100644 ---- c/herqq/hupnp_av/src/transport/havtransport_info.cpp -+++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp -@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState - HAvTransportInfo::drmStateFromString(const QString& state) - { - DrmState retVal = DrmState_Unknown; -- if (state.compare("OK", Qt::CaseInsensitive) == 0) -+ if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Ok; - } -- else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Unknown; - } -- else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ProcessingContentKey; - } -- else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ContentKeyFailure; - } -- else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_AttemptingAuthentication; - } -- else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_FailedAuthentication; - } -- else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_NotAuthenticated; - } -- else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_DeviceRevocation; - } -diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp -index 9e642c1..5f33847 100644 ---- c/herqq/hupnp_av/src/transport/hmediainfo.cpp -+++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp -@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString( - const QString& category) - { - MediaCategory retVal = Undefined; -- if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0) -+ if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0) - { - retVal = NoMedia; - } -- else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackAware; - } -- else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackUnaware; - } -diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp -index 8d3a20e..57605f0 100644 ---- c/herqq/hupnp_av/src/transport/hplaymode.cpp -+++ i/herqq/hupnp_av/src/transport/hplaymode.cpp -@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type) - HPlayMode::Type HPlayMode::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NORMAL", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0) - { - retVal = Normal; - } -- else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0) - { - retVal = Shuffle; - } -- else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatOne; - } -- else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatAll; - } -- else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0) - { - retVal = Random; - } -- else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0) - { - retVal = Direct_1; - } -- else if (type.compare("INTRO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0) - { - retVal = Intro; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -index ab29f09..a1a5de0 100644 ---- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString( - const QString& type) - { - Type retVal = Unknown; -- if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = Writable; - } -- else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0) - { - retVal = Protected; - } -- else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = NotWritable; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty()) -+ else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty()) - { - retVal = VendorDefined; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -index bf7dd90..b659fd7 100644 ---- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode) - HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode) - { - Type retVal = Undefined; -- if (mode.compare("0:EP", Qt::CaseInsensitive) == 0) -+ if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0) - { - retVal = Ep; - } -- else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0) - { - retVal = Lp; - } -- else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0) - { - retVal = Sp; - } -- else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0) - { - retVal = Basic; - } -- else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0) - { - retVal = Medium; - } -- else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0) - { - retVal = High; - } -- else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp -index c2ac69a..d3eee2b 100644 ---- c/herqq/hupnp_av/src/transport/hseekinfo.cpp -+++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp -@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type) - HSeekMode::Type HSeekMode::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0) - { - retVal = TrackNr; - } -- else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = AbsTime; - } -- else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = RelTime; - } -- else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = AbsCount; - } -- else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = RelCount; - } -- else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0) - { - retVal = ChannelFreq; - } -- else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = TapeIndex; - } -- else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = RelTapeIndex; - } -- else if (type.compare("FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = Frame; - } -- else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = RelFrame; - } -diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp -index d64b1bc..4a34b8d 100644 ---- c/herqq/hupnp_av/src/transport/htransportaction.cpp -+++ i/herqq/hupnp_av/src/transport/htransportaction.cpp -@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type) - HTransportAction::Type HTransportAction::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("PLAY", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0) - { - retVal = Play; - } -- else if (type.compare("STOP", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0) - { - retVal = Stop; - } -- else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0) - { - retVal = Pause; - } -- else if (type.compare("SEEK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0) - { - retVal = Seek; - } -- else if (type.compare("NEXT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0) - { - retVal = Next; - } -- else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0) - { - retVal = Previous; - } -- else if (type.compare("RECORD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0) - { - retVal = Record; - } -diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp -index ecfaf0b..8ca9b1c 100644 ---- c/herqq/hupnp_av/src/transport/htransportinfo.cpp -+++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp -@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type) - HTransportStatus::Type HTransportStatus::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("OK", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = OK; - } -- else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0) - { - retVal = ErrorOccurred; - } -diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp -index b460065..f2a1ac3 100644 ---- c/herqq/hupnp_av/src/transport/htransportstate.cpp -+++ i/herqq/hupnp_av/src/transport/htransportstate.cpp -@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type) - HTransportState::Type HTransportState::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0) - { - retVal = NoMediaPresent; - } -- else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0) - { - retVal = Playing; - } -- else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0) - { - retVal = Transitioning; - } -- else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0) - { - retVal = PausedPlayback; - } -- else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = PausedRecording; - } -- else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = Recording; - } diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 08ef667b24ebc..b8de133f50254 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -20,6 +20,7 @@ let # docs install -dm755 "$out/share/doc" install -m644 ${readmeFile} $out/share/doc/${name}.txt + runHook postInstall ''; } // args); @@ -107,7 +108,7 @@ let }; mkDictFromDicollecte = - { shortName, shortDescription, longDescription, dictFileName }: + { shortName, shortDescription, longDescription, dictFileName, isDefault ? false }: mkDict rec { inherit dictFileName; version = "5.3"; @@ -131,6 +132,12 @@ let unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} ''; + postInstall = stdenv.lib.optionalString isDefault '' + for ext in aff dic; do + ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext + ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext + done + ''; }; mkDictFromWordlist = @@ -483,6 +490,7 @@ in { réformées, suivant la lente évolution de l’orthographe actuelle. Ce dictionnaire contient les graphies les moins polémiques de la réforme. ''; + isDefault = true; }; fr-reforme1990 = mkDictFromDicollecte { diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 07df956e7a43d..afab8a4e9a433 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 09556297da21d..17473db9eebd7 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/attica-5.57.0.tar.xz"; - sha256 = "a13682bccaca3529df6e3b54e1d4e48fb3d1654fe1b142701e73ce9fe0b87655"; - name = "attica-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; + sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; + name = "attica-5.58.0.tar.xz"; }; }; baloo = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/baloo-5.57.0.tar.xz"; - sha256 = "32ab4ed2d295fe734a4a475403dea72e2feef27f662ae64c841c410eb7bb3dd3"; - name = "baloo-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; + sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; + name = "baloo-5.58.0.tar.xz"; }; }; bluez-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/bluez-qt-5.57.0.tar.xz"; - sha256 = "43e1be1882832cef88186255a6b692d9fd1366bad09db0c2075a126b0fc0df65"; - name = "bluez-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; + sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; + name = "bluez-qt-5.58.0.tar.xz"; }; }; breeze-icons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/breeze-icons-5.57.0.tar.xz"; - sha256 = "c3ba92acb5bfcff66f41232ebc6e8c893dab78ac59a713fa4bfa2a0e097f4ed2"; - name = "breeze-icons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; + sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; + name = "breeze-icons-5.58.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/extra-cmake-modules-5.57.0.tar.xz"; - sha256 = "aa53f8953792b452672f275c2ea9b96ab2adf3e13d9645c3451b06dbc8055b18"; - name = "extra-cmake-modules-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; + sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; + name = "extra-cmake-modules-5.58.0.tar.xz"; }; }; frameworkintegration = { - version = "5.57.0"; + version = "5.58.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/frameworkintegration-5.57.0.tar.xz"; - sha256 = "9c5850c1d41900bcb81e7929d54856d0cdd2565a276e5e262f624eb1217cbb78"; - name = "frameworkintegration-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; + sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; + name = "frameworkintegration-5.58.1.tar.xz"; }; }; kactivities = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-5.57.0.tar.xz"; - sha256 = "442527db8710b9045dc574816bc9c32cad5f8a404e681fb030d7e9c2f3d77761"; - name = "kactivities-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; + sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; + name = "kactivities-5.58.0.tar.xz"; }; }; kactivities-stats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-stats-5.57.0.tar.xz"; - sha256 = "4c7a49905ec1b6e03831986b254d0fd091e44fe920fffa123c969765c6474ba3"; - name = "kactivities-stats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; + sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; + name = "kactivities-stats-5.58.0.tar.xz"; }; }; kapidox = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kapidox-5.57.0.tar.xz"; - sha256 = "16f53e4722adddaa8729b4cccc374d16bdbfdd987f8655d2b431a91b046fe2b2"; - name = "kapidox-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; + sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; + name = "kapidox-5.58.0.tar.xz"; }; }; karchive = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/karchive-5.57.0.tar.xz"; - sha256 = "e0e64e7e88c8df96f894de20aff4d12925e0d362c5134df83473ea48c0432783"; - name = "karchive-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; + sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; + name = "karchive-5.58.0.tar.xz"; }; }; kauth = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kauth-5.57.0.tar.xz"; - sha256 = "9d6b9135cc47710b28e2a7731c4c5c1f6dba2b0e5fe982b9d2a82a11d7d497c2"; - name = "kauth-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; + sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; + name = "kauth-5.58.0.tar.xz"; }; }; kbookmarks = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kbookmarks-5.57.0.tar.xz"; - sha256 = "bf57f111e176ab2ecb79646b1f93cf5d84a8d3fcfb13b805b5140e75b42eb085"; - name = "kbookmarks-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; + sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; + name = "kbookmarks-5.58.0.tar.xz"; }; }; kcmutils = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcmutils-5.57.0.tar.xz"; - sha256 = "f3ee63a356e18be95a15141346356f3f43bb067d0326021d99f4b73ee4716fbb"; - name = "kcmutils-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; + sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; + name = "kcmutils-5.58.0.tar.xz"; }; }; kcodecs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcodecs-5.57.0.tar.xz"; - sha256 = "c98b98cf7258c03fa5131a987e278f348d52f792dcb9f2a5664fe35aadea6995"; - name = "kcodecs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; + sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; + name = "kcodecs-5.58.0.tar.xz"; }; }; kcompletion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcompletion-5.57.0.tar.xz"; - sha256 = "5ad8746a57cef2b12da5a97e296cbb0b708e8ecfb4253786a899fa86951395ec"; - name = "kcompletion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; + sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; + name = "kcompletion-5.58.0.tar.xz"; }; }; kconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfig-5.57.0.tar.xz"; - sha256 = "155b0dbba8772aa8ea3e75217029daa00ada8699e5a807154214f66b2462c010"; - name = "kconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; + sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; + name = "kconfig-5.58.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfigwidgets-5.57.0.tar.xz"; - sha256 = "771c5641a9ae465feaf00ffbb3f3c0433ad8d4a90355dc50d5b6b1b472912eb0"; - name = "kconfigwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; + sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; + name = "kconfigwidgets-5.58.0.tar.xz"; }; }; kcoreaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcoreaddons-5.57.0.tar.xz"; - sha256 = "7c2573de9b745e55fe61cff26941839cff0d2e40b6c5d791c24c9d6cc8cf7485"; - name = "kcoreaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; + sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; + name = "kcoreaddons-5.58.0.tar.xz"; }; }; kcrash = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcrash-5.57.0.tar.xz"; - sha256 = "4b12719a20f2ff0fe0a2656609d0aa277245cd2a9f764a7b6cfaa6da9d928dc0"; - name = "kcrash-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; + sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; + name = "kcrash-5.58.0.tar.xz"; }; }; kdbusaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdbusaddons-5.57.0.tar.xz"; - sha256 = "86946d97e74420637f59ea0fff93e303bcbdc5b1d5e1c6361e2d9a3ceb0e1259"; - name = "kdbusaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; + sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; + name = "kdbusaddons-5.58.0.tar.xz"; }; }; kdeclarative = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdeclarative-5.57.0.tar.xz"; - sha256 = "5335b39ac1cca34209c0420dab867b67ddb0e9ee483bdd6d4192269a1d5f654f"; - name = "kdeclarative-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; + sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; + name = "kdeclarative-5.58.0.tar.xz"; }; }; kded = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kded-5.57.0.tar.xz"; - sha256 = "04327dda12fa547bebb8e1b1bc26373e8f4174007dd629231403d59ce004201f"; - name = "kded-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; + sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; + name = "kded-5.58.0.tar.xz"; }; }; kdelibs4support = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kdelibs4support-5.57.0.tar.xz"; - sha256 = "e9d1c06191031b482ea01d891756d125ff32927239c36a3011fc7b8f17aca1b0"; - name = "kdelibs4support-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; + sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; + name = "kdelibs4support-5.58.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesignerplugin-5.57.0.tar.xz"; - sha256 = "9e85a4ac798122b459722773a6e81f639be6dfe9c9714a16704f555c88334393"; - name = "kdesignerplugin-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; + sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; + name = "kdesignerplugin-5.58.0.tar.xz"; }; }; kdesu = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesu-5.57.0.tar.xz"; - sha256 = "76d98db52f7f375991cd7ccbbf1dc100716f99a5792b71ef31a75cc33cf45b19"; - name = "kdesu-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; + sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; + name = "kdesu-5.58.0.tar.xz"; }; }; kdewebkit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdewebkit-5.57.0.tar.xz"; - sha256 = "809e9df4ac3ca8b59799c8781694092cb1793f03af0b87a347a1c6019f96a592"; - name = "kdewebkit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; + sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; + name = "kdewebkit-5.58.0.tar.xz"; }; }; kdnssd = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdnssd-5.57.0.tar.xz"; - sha256 = "5a61b942fd14c9d96370e19fd7a29594bfcbd3074e12625caac083206fce2789"; - name = "kdnssd-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; + sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; + name = "kdnssd-5.58.0.tar.xz"; }; }; kdoctools = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdoctools-5.57.0.tar.xz"; - sha256 = "649dbaff4f1559302e7da07f423a0bc9e3faa1c7a93dfeb170e50bf452d8def2"; - name = "kdoctools-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; + sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; + name = "kdoctools-5.58.0.tar.xz"; }; }; kemoticons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kemoticons-5.57.0.tar.xz"; - sha256 = "c07b69c9275c117507166622e185c2bf0f36e1e4e8ad7b25fa3e1d793da4711b"; - name = "kemoticons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; + sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; + name = "kemoticons-5.58.0.tar.xz"; }; }; kfilemetadata = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kfilemetadata-5.57.0.tar.xz"; - sha256 = "49e6c281fdffd4f5fe363c6cefdb6c3022ef57c935d7d6b135607cdde9b2d116"; - name = "kfilemetadata-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; + sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; + name = "kfilemetadata-5.58.0.tar.xz"; }; }; kglobalaccel = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kglobalaccel-5.57.0.tar.xz"; - sha256 = "46370dcd4f110e6ccde3b3bf9c075deb1f22ad54016137925e4aea97b03cc2fe"; - name = "kglobalaccel-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; + sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; + name = "kglobalaccel-5.58.0.tar.xz"; }; }; kguiaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kguiaddons-5.57.0.tar.xz"; - sha256 = "744eb0ec35c936c17c3d11a08d19014e2166c4a307370207e0f5a38f01a91ebd"; - name = "kguiaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; + sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; + name = "kguiaddons-5.58.0.tar.xz"; }; }; kholidays = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kholidays-5.57.0.tar.xz"; - sha256 = "f7db45906623c33dfbb297810082f8ff30c949e6a7d477f3b72de0521b0c9452"; - name = "kholidays-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; + sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; + name = "kholidays-5.58.0.tar.xz"; }; }; khtml = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/khtml-5.57.0.tar.xz"; - sha256 = "63d22fbc8cad3075a0b7ef195291c4b79ebc65da5de81b4885cac1063d783da3"; - name = "khtml-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; + sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; + name = "khtml-5.58.0.tar.xz"; }; }; ki18n = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ki18n-5.57.0.tar.xz"; - sha256 = "bbd60981c9a0c1f9d9a52c8dd86adef7c4c30caf603f806d8730febaa36f0dd9"; - name = "ki18n-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; + sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; + name = "ki18n-5.58.0.tar.xz"; }; }; kiconthemes = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kiconthemes-5.57.0.tar.xz"; - sha256 = "09abb03a97027948a1116bfb2ca9842d3f8fb2def83b0b02aaed194dd5bd16f3"; - name = "kiconthemes-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; + sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; + name = "kiconthemes-5.58.0.tar.xz"; }; }; kidletime = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kidletime-5.57.0.tar.xz"; - sha256 = "e99a07f814573526ed5141fc9e4bc2df12298df53a0d2787c3b7a4c3af915665"; - name = "kidletime-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; + sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; + name = "kidletime-5.58.0.tar.xz"; }; }; kimageformats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kimageformats-5.57.0.tar.xz"; - sha256 = "d7ce6c4737ae2846f015633e7479b60460d960a3a578777c2a884d499bd6cc14"; - name = "kimageformats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; + sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; + name = "kimageformats-5.58.0.tar.xz"; }; }; kinit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kinit-5.57.0.tar.xz"; - sha256 = "7d5ca84d7bd554531aa6d720d3dc41ac091cf047a52d097a23e5c8fad08b684c"; - name = "kinit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; + sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; + name = "kinit-5.58.0.tar.xz"; }; }; kio = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kio-5.57.0.tar.xz"; - sha256 = "d68151d58f1ed2e0724074c6bca42510dd3e19617baa4b4130198ad3a36a64ab"; - name = "kio-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; + sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; + name = "kio-5.58.0.tar.xz"; }; }; kirigami2 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kirigami2-5.57.0.tar.xz"; - sha256 = "3cdbea0e472293e85e625820f6b9e2d20f59cff263ed150904b6b2acad81062b"; - name = "kirigami2-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; + sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; + name = "kirigami2-5.58.0.tar.xz"; }; }; kitemmodels = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemmodels-5.57.0.tar.xz"; - sha256 = "b0eef30ce3e5f2fe9afb60d589bea16a0d0e4a57ffffb37ae0e14a54f1681464"; - name = "kitemmodels-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; + sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; + name = "kitemmodels-5.58.0.tar.xz"; }; }; kitemviews = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemviews-5.57.0.tar.xz"; - sha256 = "6b499a21c88d5998c903e8e4dd480c612b96e5e31d17430a507c07566febdd30"; - name = "kitemviews-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; + sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; + name = "kitemviews-5.58.0.tar.xz"; }; }; kjobwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kjobwidgets-5.57.0.tar.xz"; - sha256 = "4b98e7cd9b8d877326854addcee300071afc92f4378d3a94734e470271638002"; - name = "kjobwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; + sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; + name = "kjobwidgets-5.58.0.tar.xz"; }; }; kjs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjs-5.57.0.tar.xz"; - sha256 = "865fb86566a0ea904ab0a3bd6a63787161b28578660d475fc316c50c8a7b1e90"; - name = "kjs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; + sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; + name = "kjs-5.58.0.tar.xz"; }; }; kjsembed = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjsembed-5.57.0.tar.xz"; - sha256 = "741aae8db274febe7e5d0d10dc99271efc590b2465d2c4d4e4a9162d2b36e3b4"; - name = "kjsembed-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; + sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; + name = "kjsembed-5.58.0.tar.xz"; }; }; kmediaplayer = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kmediaplayer-5.57.0.tar.xz"; - sha256 = "521dcb4b3f9a67203e9eac27b8d777cb22557861b9fae0006c2aecda96d9bad4"; - name = "kmediaplayer-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; + sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; + name = "kmediaplayer-5.58.0.tar.xz"; }; }; knewstuff = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knewstuff-5.57.0.tar.xz"; - sha256 = "6a9d77a62b036b4ed0f32ffaa9f204db1403030d01dbe8fb055d02361db2f981"; - name = "knewstuff-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; + sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; + name = "knewstuff-5.58.0.tar.xz"; }; }; knotifications = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifications-5.57.0.tar.xz"; - sha256 = "7de068f4cf9bcefef54ae1cb180e2c0af9be951afbcaa960245507259620cf15"; - name = "knotifications-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; + sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; + name = "knotifications-5.58.0.tar.xz"; }; }; knotifyconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifyconfig-5.57.0.tar.xz"; - sha256 = "e7fe39ed72b7f79d8cafe6c30d5c62ade0f33be37a62d9e5b929064dd1750ac1"; - name = "knotifyconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; + sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; + name = "knotifyconfig-5.58.0.tar.xz"; }; }; kpackage = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpackage-5.57.0.tar.xz"; - sha256 = "2d2d497d50e8ce986d6de4462391122963d9b7605889fd20cd3ceb4dd6910814"; - name = "kpackage-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; + sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; + name = "kpackage-5.58.0.tar.xz"; }; }; kparts = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kparts-5.57.0.tar.xz"; - sha256 = "5a079986963d186e98a1174e19e490731012732ad5ad31a431a8f7a31c6b6ed2"; - name = "kparts-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; + sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; + name = "kparts-5.58.0.tar.xz"; }; }; kpeople = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpeople-5.57.0.tar.xz"; - sha256 = "7c239b80b7976e3bfa46338e05a048aecb9c1972548dc33cc8a17e66eb08a85c"; - name = "kpeople-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; + sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; + name = "kpeople-5.58.0.tar.xz"; }; }; kplotting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kplotting-5.57.0.tar.xz"; - sha256 = "c2c35030b1a2ca25f503c1a2df7ca225d156a9ea80f52883e136679aea6efc8e"; - name = "kplotting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; + sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; + name = "kplotting-5.58.0.tar.xz"; }; }; kpty = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpty-5.57.0.tar.xz"; - sha256 = "14a0f9d5ecc387c88d24270dbf4c128deb8ad18ab64b39766b335ad03a47c3b6"; - name = "kpty-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; + sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; + name = "kpty-5.58.0.tar.xz"; }; }; kross = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kross-5.57.0.tar.xz"; - sha256 = "3b0f92751bb70c64b2ac25b466f886cc8b02babf02c744bcc909aa3ce6915a66"; - name = "kross-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; + sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; + name = "kross-5.58.0.tar.xz"; }; }; krunner = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/krunner-5.57.0.tar.xz"; - sha256 = "40f52d4d883748f5b9a78b5bd7dd6aaa52eae88b89d7a33eafbcbb9ccf6f4805"; - name = "krunner-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; + sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; + name = "krunner-5.58.0.tar.xz"; }; }; kservice = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kservice-5.57.0.tar.xz"; - sha256 = "531940baa47273714fbc35941f2ef5fbdb801b7a5ed5fef5a8ff1d86bf1dae14"; - name = "kservice-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; + sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; + name = "kservice-5.58.0.tar.xz"; }; }; ktexteditor = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktexteditor-5.57.0.tar.xz"; - sha256 = "aa510656f632ef09c18af4263386265c293cb929f139786acd102881250314c3"; - name = "ktexteditor-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; + sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; + name = "ktexteditor-5.58.0.tar.xz"; }; }; ktextwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktextwidgets-5.57.0.tar.xz"; - sha256 = "b74036eea1ec19a22aa0e76cd1a8338f55e5c32a30dc47d602783c6bc5ba54bf"; - name = "ktextwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; + sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; + name = "ktextwidgets-5.58.0.tar.xz"; }; }; kunitconversion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kunitconversion-5.57.0.tar.xz"; - sha256 = "157f4d21e83a6e92e30894f472b65452ecd2183ac2e25e24f740e971befed383"; - name = "kunitconversion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; + sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; + name = "kunitconversion-5.58.0.tar.xz"; }; }; kwallet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwallet-5.57.0.tar.xz"; - sha256 = "ad089026f4d5b10d567d0fd56f8b63749acd214fb8029d43187ba42afaf36975"; - name = "kwallet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; + sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; + name = "kwallet-5.58.0.tar.xz"; }; }; kwayland = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwayland-5.57.0.tar.xz"; - sha256 = "f00d2997163f559cecf30f5e945d5456628a0d120acafba49fa14af28c22b1d6"; - name = "kwayland-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; + sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; + name = "kwayland-5.58.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwidgetsaddons-5.57.0.tar.xz"; - sha256 = "abd80a566e1003bca7c72d3a0dc1ee470bc9935d11371cfff0d960f11e1ef5c2"; - name = "kwidgetsaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; + sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; + name = "kwidgetsaddons-5.58.0.tar.xz"; }; }; kwindowsystem = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwindowsystem-5.57.0.tar.xz"; - sha256 = "0c8a009dde7ca1722810777b99aa4e1a3471687460c25e0f41645c9e11daf274"; - name = "kwindowsystem-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; + sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; + name = "kwindowsystem-5.58.0.tar.xz"; }; }; kxmlgui = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlgui-5.57.0.tar.xz"; - sha256 = "325124518e8fa4847c898dee193d96b76a7ba27d7c79d875f34c632f46fe1f90"; - name = "kxmlgui-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; + sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; + name = "kxmlgui-5.58.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlrpcclient-5.57.0.tar.xz"; - sha256 = "d47d5cc49f050dda3a26f7654226c0d124ca5ba5503a60e606307426bbe43b9d"; - name = "kxmlrpcclient-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; + sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; + name = "kxmlrpcclient-5.58.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/modemmanager-qt-5.57.0.tar.xz"; - sha256 = "030bfcfafd5079f25a165aaa5f52693a8fe4b3c15c1345a641716c4329e0929d"; - name = "modemmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; + sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; + name = "modemmanager-qt-5.58.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/networkmanager-qt-5.57.0.tar.xz"; - sha256 = "4d2da2556bfeef4be03833d707284573b469a1f6ad66ba73eae80835bd2e1982"; - name = "networkmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; + sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; + name = "networkmanager-qt-5.58.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/oxygen-icons5-5.57.0.tar.xz"; - sha256 = "2b12a9de3767d233b4b01bc97e23899d94c02b13fee4d20483d3f5d2baaaa1e5"; - name = "oxygen-icons5-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; + sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; + name = "oxygen-icons5-5.58.0.tar.xz"; }; }; plasma-framework = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/plasma-framework-5.57.0.tar.xz"; - sha256 = "b886aeee6691911ead25e6fd5631fa41ce2330b0fbbdc040717fa576bacae2ca"; - name = "plasma-framework-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; + sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; + name = "plasma-framework-5.58.0.tar.xz"; }; }; prison = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/prison-5.57.0.tar.xz"; - sha256 = "6613decb2e0b61af5af3a3a9995970c2fdaa72f36bcfd7e9db547017ee4ca235"; - name = "prison-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; + sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; + name = "prison-5.58.0.tar.xz"; }; }; purpose = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/purpose-5.57.0.tar.xz"; - sha256 = "4b38f1b88e6e621bc20c04a5f7bc7293fba6c851209167c5e794b6becaea244e"; - name = "purpose-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; + sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; + name = "purpose-5.58.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/qqc2-desktop-style-5.57.0.tar.xz"; - sha256 = "ff40fd6d48815c39e46e19eadf4048f04e79f34f7522a9ba655e6d4a1690546e"; - name = "qqc2-desktop-style-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; + sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; + name = "qqc2-desktop-style-5.58.0.tar.xz"; }; }; solid = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/solid-5.57.0.tar.xz"; - sha256 = "fbdb0678a5a1b9f902661b4823dbae4629a88708b729d827dd0598799f727209"; - name = "solid-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; + sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; + name = "solid-5.58.0.tar.xz"; }; }; sonnet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/sonnet-5.57.0.tar.xz"; - sha256 = "08e13a707b64055f512bba982ec5e69a9e7c62c02d1ee8b6fdc67c67b1265334"; - name = "sonnet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; + sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; + name = "sonnet-5.58.0.tar.xz"; }; }; syndication = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syndication-5.57.0.tar.xz"; - sha256 = "251b2333bd3e49f833ef5ac12e0d2540a7640c84625090a85d99715927653728"; - name = "syndication-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; + sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; + name = "syndication-5.58.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syntax-highlighting-5.57.0.tar.xz"; - sha256 = "e82261e791005a55414fc81a396ca33ee8c061acd66c2c351492d866b3592e9f"; - name = "syntax-highlighting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; + sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; + name = "syntax-highlighting-5.58.0.tar.xz"; }; }; threadweaver = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/threadweaver-5.57.0.tar.xz"; - sha256 = "83969d0f6e4a337fba6b554708f867654af86368066ccef75a4fde85569d1ee0"; - name = "threadweaver-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; + sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; + name = "threadweaver-5.58.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 5074709001114..d55c38168686a 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: +{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # libassuan-config depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = [ pth gettext ]; + buildInputs = [ npth gettext ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; license = licenses.lgpl2Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix new file mode 100644 index 0000000000000..fe2f0eadeeb37 --- /dev/null +++ b/pkgs/development/libraries/libcbor/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, cmocka }: + +stdenv.mkDerivation rec { + pname = "libcbor"; + version = "2019-02-23"; + + src = fetchFromGitHub { + owner = "PJK"; + repo = pname; + rev = "87f977e732ca216682a8583a0e43803eb6b9c028"; + sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm"; + }; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ cmocka ]; + + doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + + NIX_CFLAGS_COMPILE = [ "-fno-lto" ]; + + meta = with stdenv.lib; { + description = "CBOR protocol implementation for C and others"; + homepage = https://github.com/PJK/libcbor; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index be7852e6cdd2f..ea4a50275a3fb 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -3,11 +3,11 @@ libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; + sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; buildInputs = [ libusb1 ] diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index cc9db8f7e661e..65d04cb53f16c 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { done ''; - preBuild = '' - makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) - ''; + PREFIX = placeholder "out"; + LIBDIRNAME = "/lib"; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix new file mode 100644 index 0000000000000..b670172ce1eed --- /dev/null +++ b/pkgs/development/libraries/libfido2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: + +stdenv.mkDerivation rec { + pname = "libfido2"; + version = "1.1.0"; + src = fetchurl { + url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; + sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libcbor libressl udev ]; + + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; + + meta = with stdenv.lib; { + description = '' + Provides library functionality for FIDO 2.0, including communication with a device over USB. + ''; + homepage = https://github.com/Yubico/libfido2; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + + }; +} diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 3f3062e3c0815..410496a7bb779 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 -, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 +, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }: + +assert thinkpad -> openssl != null; stdenv.mkDerivation rec { - name = "libfprint-${version}"; + pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.99.0"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; - sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; - }; + src = { + libfprint-thinkpad = + fetchFromGitHub { + owner = "3v1n0"; + repo = "libfprint"; + rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; + sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; + }; + libfprint = fetchurl { + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; + }; + }.${pname}; + + buildInputs = [ libusb pixman glib nss gtk3 ] + ++ stdenv.lib.optional thinkpad openssl; - buildInputs = [ libusb pixman glib nss gtk3 ]; nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index c7b76497fa8c2..62c6b45c5d450 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: -let - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libglvnd-${version}"; version = "1.0.0"; @@ -13,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 @@ -45,7 +43,13 @@ in stdenv.mkDerivation rec { }); outputs = [ "out" "dev" ]; - passthru = { inherit driverLink; }; + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so + ''; + + passthru = { inherit (addOpenGLRunpath) driverLink; }; meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch new file mode 100644 index 0000000000000..2ea1b124ce7b8 --- /dev/null +++ b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch @@ -0,0 +1,15 @@ +Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 +--- a/libheif/heif_context.cc ++++ b/libheif/heif_context.cc +@@ -571,6 +571,11 @@ + image->set_is_alpha_channel_of(refs[0]); + + auto master_iter = m_all_images.find(refs[0]); ++ if (master_iter == m_all_images.end()) { ++ return Error(heif_error_Invalid_input, ++ heif_suberror_Nonexisting_item_referenced, ++ "Non-existing alpha image referenced"); ++ } + master_iter->second->set_alpha_channel(image); + } + diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 581a579cbe2c2..3182345bfd482 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; }; + patches = [ ./1.4.0-CVE-2019-11471.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 408155fd5a77f..d9db09f1e98e7 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libndctl-${version}"; - version = "64.1"; + version = "65"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"; + sha256 = "0d8hzfvyxs2q8kgkwgdizlml41kin4mhx3vpdsjk34pfi7mqy69y"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 54108e1a007bc..957201b83abc3 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libsass-${version}"; - version = "3.5.5"; + pname = "libsass"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/e2e/unicode-pwd + ''; }; preConfigure = '' diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index c163720f56ede..ad0557049e3ec 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.9"; + pname = "libu2f-host"; + version = "1.1.10"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "1hnh3f4scx07v9jfkr1nnxasmydk1cmivn0nijcp2p75bc1fznip"; + url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.xz"; + sha256 = "0vrivl1dwql6nfi48z6dy56fwy2z13d7abgahgrs2mcmqng7hra2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c90e0ee009e8f..b7dd2c8ae1737 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre118_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "7b989f34191302011b5b49bf5b26b36862d54056"; - sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; + rev = "2e719820d47cdb48308265f95547d2c9458bbfe7"; + sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5"; }; enableParallelBuilding = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin + cp ./examples/link-cp $out/bin/io_uring-link-cp ''; meta = with stdenv.lib; { @@ -34,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index c5ff7c11713be..9edb9b475e8ad 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libxmlb-${version}"; - version = "0.1.9"; + version = "0.1.10"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1rdpsssrwpx24snqb82hisjybnpz9fq91wbmxfi2s63xllzi14b6"; + sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd"; }; nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index ec6dc5f905280..abdc7502052ba 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: +{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -9,12 +9,18 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - nativeBuildInputs = [ ruby ]; + nativeBuildInputs = [ ruby addOpenGLRunpath ]; buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + ''; + + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libOpenCL.so ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index de9a656f6ff15..d5bd065ab6488 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { ++ lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff index 14199d4050303..d2ebbf3b45a8a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644 // The code below has the same effect as this one: // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; @@ -46,7 +46,7 @@ index b8c8f2a..e7f4dc5 100644 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 0014a1452aa0d..f43329d355397 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -106,6 +106,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index d84596bd0544c..ef0cf97a428d2 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -110,6 +110,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index d1e9af299261c..9baca8124bd76 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -108,6 +108,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix new file mode 100644 index 0000000000000..e6ef428cc3c4e --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase }: + +qtModule { + name = "qtnetworkauth"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6b43f6ed25c00..2a474ab0ffea5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -58,7 +58,8 @@ qtModule { ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' + # this file used to exist in gdk_pixbuf? + ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index b53335f45c342..addf9a1dbd6cc 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake }: +{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + qmakeFlags = [ "quazip" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; - meta = { + meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.lgpl21Plus; homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ - platforms = stdenv.lib.platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix new file mode 100644 index 0000000000000..74b8e381f931f --- /dev/null +++ b/pkgs/development/libraries/rttr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, ninja }: + +stdenv.mkDerivation rec { + pname = "rttr"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "${pname}org"; + repo = pname; + rev = "v${version}"; + sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_UNIT_TESTS=OFF" + "-DBUILD_PACKAGE=OFF" + ]; + + meta = with stdenv.lib; { + description = "C++ Reflection Library"; + homepage = https://www.rttr.org; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index bb1258655b5bf..3c448abeccf6d 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -7,6 +7,7 @@ , lib , cudatoolkit , fetchurl +, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + nativeBuildInputs = [ addOpenGLRunpath ]; + installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) @@ -31,6 +34,12 @@ stdenv.mkDerivation rec { cp -a lib64 $out/lib64 ''; + # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/lib*.so + ''; + propagatedBuildInputs = [ cudatoolkit ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index badd08291de49..a099b779a7819 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, cudatoolkit }: +{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which addOpenGLRunpath ]; buildInputs = [ cudatoolkit ]; @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput lib/libnccl_static.a $dev + + # Set RUNPATH so that libnvidia-ml in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/lib*.so ''; NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 14672c78d21cb..cab0e69ad1a76 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spdk-${version}"; - version = "18.04"; + version = "19.04"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n"; + sha256 = "10mzal1hspnh26ws5d7sc54gyjfzkf6amr0gkd7b368ng2a9z8s6"; }; nativeBuildInputs = [ python ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of libraries for fast user-mode storage"; - homepage = http://www.spdk.io; + homepage = "https://spdk.io/"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index bc583f732db6b..0169a42ed65e1 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,8 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 -, openssl, libpulseaudio, pixman, gobject-introspection, libjpeg_turbo, zlib -, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup -, withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: +{ stdenv +, fetchurl +, pkgconfig +, fetchpatch +, meson +, ninja +, python3 +, spice-protocol +, gettext +, openssl +, libpulseaudio +, pixman +, gobject-introspection +, libjpeg_turbo +, zlib +, cyrus_sasl +, usbredir +, libsoup +, polkit +, acl +, usbutils +, vala +, gtk3 +, epoxy +, libdrm +, gst_all_1 +, phodav +, libopus +, gtk-doc +, json-glib +, lz4 +, libcacard +, perl +, docbook_xsl +, withPolkit ? true +}: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -25,18 +56,15 @@ # KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" # ''; -with stdenv.lib; +stdenv.mkDerivation rec { + pname = "spice-gtk"; + version = "0.37"; -let - inherit (python2Packages) python pygtk; -in stdenv.mkDerivation rec { - name = "spice-gtk-0.35"; - - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; + url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.bz2"; + sha256 = "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"; }; postPatch = '' @@ -45,27 +73,50 @@ in stdenv.mkDerivation rec { --replace 'ACL_HELPER_PATH"/' '"' ''; - buildInputs = [ - spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile - ] ++ optionals withPolkit [ polkit acl usbutils ] ; + nativeBuildInputs = [ + docbook_xsl + gettext + gobject-introspection + gtk-doc + libsoup + meson + ninja + perl + pkgconfig + python3 + python3.pkgs.pyparsing + python3.pkgs.six + vala + ]; - nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobject-introspection ]; + buildInputs = [ + cyrus_sasl + epoxy + gst_all_1.gst-plugins-base + gtk3 + json-glib + libcacard + libdrm + libjpeg_turbo + lz4 + openssl + libopus + phodav + pixman + spice-protocol + usbredir + zlib + ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - configureFlags = [ - "--with-gtk3" - "--enable-introspection" - "--enable-vala" - "--enable-celt051" + mesonFlags = [ + "-Dauto_features=enabled" + "-Dcelt051=disabled" + "-Dpulse=disabled" # is deprecated upstream ]; - dontDisableStatic = true; # Needed by the coroutine test - - enableParallelBuilding = true; - - meta = { + meta = with stdenv.lib; { description = "A GTK+3 SPICE widget"; longDescription = '' spice-gtk is a GTK+3 SPICE widget. It features glib-based diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 18ec02b4acf3c..c32f336939cb5 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.15"; + pname = "spice-protocol"; + version = "0.14.0"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb"; + url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; + sha256 = "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n"; }; postInstall = '' diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/pkgs/development/libraries/spice/correct-meson.patch new file mode 100644 index 0000000000000..d3422cb915b39 --- /dev/null +++ b/pkgs/development/libraries/spice/correct-meson.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 8b8ae8bb..e58c436c 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ + # project definition + # + project('spice', 'c', +- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), ++ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(), + license : 'LGPLv2.1', + meson_version : '>= 0.48') + +diff --git a/server/meson.build b/server/meson.build +index 34d8eef1..988ccab2 100644 +--- a/server/meson.build ++++ b/server/meson.build +@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.') + major = '@0@'.format(version_info[0]) + minor = '@0@'.format(version_info[1]) + micro = version_info[2].to_int() +-if not version_info[3].contains('git') ++if not version_info.contains('git') + micro += 1 + endif + micro = '@0@'.format(micro) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index dadbe57dccdd8..902bc6a5560fc 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,38 +1,93 @@ -{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib -, openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl -, libcacard, lz4 }: - -with stdenv.lib; +{ stdenv +, substituteAll +, fetchurl +, meson +, ninja +, pkgconfig +, pixman +, alsaLib +, openssl +, libXrandr +, libXfixes +, libXext +, libXrender +, libXinerama +, libjpeg +, zlib +, spice-protocol +, python3 +, glib +, cyrus_sasl +, libcacard +, lz4 +, libopus +, gst_all_1 +, orc +}: stdenv.mkDerivation rec { - name = "spice-0.14.0"; + pname = "spice"; + version = "0.14.2"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; + url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; + sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"; }; - buildInputs = [ pixman celt alsaLib openssl libjpeg zlib - libXrandr libXfixes libXrender libXext libXinerama - python pyparsing glib cyrus_sasl libcacard lz4 ]; + patches = [ + # submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4 + ./correct-meson.patch + ]; + + postPatch = '' + patchShebangs build-aux + ''; + + + nativeBuildInputs = [ + meson + ninja + pkgconfig + spice-protocol + python3 + python3.pkgs.six + python3.pkgs.pyparsing + ]; - nativeBuildInputs = [ pkgconfig spice-protocol ]; + buildInputs = [ + alsaLib + cyrus_sasl + glib + gst_all_1.gst-plugins-base + libXext + libXfixes + libXinerama + libXrandr + libXrender + libcacard + libjpeg + libopus + lz4 + openssl + orc + pixman + python3.pkgs.pyparsing + zlib + ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - configureFlags = [ - "--with-sasl" - "--enable-smartcard" - "--enable-client" - "--enable-lz4" + mesonFlags = [ + "-Dauto_features=enabled" + "-Dgstreamer=1.0" + "-Dcelt051=disabled" ]; postInstall = '' ln -s spice-server $out/include/spice ''; - meta = { + meta = with stdenv.lib; { description = "Complete open source solution for interaction with virtualized desktop devices"; longDescription = '' The Spice project aims to provide a complete open source solution for interaction diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix new file mode 100644 index 0000000000000..40e1a280aa249 --- /dev/null +++ b/pkgs/development/libraries/symengine/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gmp +, flint +, mpfr +, libmpc +}: + +stdenv.mkDerivation rec { + name = "symengine-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "symengine"; + repo = "symengine"; + rev = "v${version}"; + sha256 = "1kz893p3pmsw3gfwickk2nliw8p63yp89xriad7kpw4kmhvgr8gb"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gmp flint mpfr libmpc ]; + + cmakeFlags = [ + "-DWITH_FLINT=ON" + "-DINTEGER_CLASS=flint" + "-DWITH_SYMENGINE_THREAD_SAFE=yes" + "-DWITH_MPC=yes" + "-DBUILD_FOR_DISTRIBUTION=yes" + ]; + + doCheck = true; + + checkPhase = '' + ctest + ''; + + meta = with stdenv.lib; { + description = "SymEngine is a fast symbolic manipulation library"; + homepage = https://github.com/symengine/symengine; + platforms = platforms.unix ++ platforms.windows; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 72f6f57553fb4..91bf7e3937845 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; + sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 7d53065ba324a..891ad373e0277 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig -, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let version = "1.1.106"; @@ -17,17 +17,23 @@ stdenv.mkDerivation rec { sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; outputs = [ "out" "dev" ]; + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libvulkan.so + ''; + meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = https://www.lunarg.com; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 276f509772c2f..9998add0d9307 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,36 +1,37 @@ -{stdenv, fetchurl, yasm, enable10bit ? false}: +{ stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - version = "20170731-2245"; - name = "x264-${version}"; + pname = "x264"; + version = "20190517-2245"; src = fetchurl { url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; + sha256 = "1xv41z04km3rf374xk3ny7v8ibr211ph0j5am0909ln63mphc48f"; }; - patchPhase = '' - sed -i s,/bin/bash,${stdenv.shell}, configure version.sh + postPatch = '' + patchShebangs . ''; - outputs = [ "out" "lib" ]; # leaving 52 kB of headers + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" ]; preConfigure = '' - # `AS' is set to the binutils assembler, but we need yasm + # `AS' is set to the binutils assembler, but we need nasm unset AS ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" - ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; - buildInputs = [ yasm ]; + nativeBuildInputs = [ nasm ]; meta = with stdenv.lib; { description = "Library for encoding H264/AVC video streams"; homepage = http://www.videolan.org/developers/x264.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt tadeokondrak ]; }; } diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 5d70a9f0a1cef..b81fab1ed76f3 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -44,7 +44,7 @@ deployAndroidPackage { mkdir -p $out/bin for i in ndk-build do - ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done ''; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 9a816261b3e71..0b9bb7c5b5fc2 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -9,6 +9,9 @@ bundlerApp rec { gemset = if beta then ./gemset-beta.nix else ./gemset.nix; exes = [ "pod" ]; + # toString prevents the update script from being copied into the nix store + passthru.updateScript = toString ./update; + meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; homepage = https://github.com/CocoaPods/CocoaPods; diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 53c113046c6f6..309142e0e1d2c 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -3,6 +3,8 @@ set -e +cd "$(dirname "${BASH_SOURCE[0]}")" + rm -f Gemfile.lock Gemfile-beta.lock bundler lock BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 01441fcb4ec38..a0a00472a4dea 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { EOF ''; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index bcbb96c2c0cbe..b647312615853 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; postInstall = '' diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 84ac1039628d9..157beaac4bc7b 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -9,11 +9,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; + sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss"; }; buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index d2f85f823ae9b..f21f05eeae5ff 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: stdenv.mkDerivation rec { - version = "0.8.4"; + version = "0.8.5"; name = "ocaml${ocaml.version}-ptime-${version}"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg"; + sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; }; buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index f2fd6eebd56eb..bd84dd06e7f4a 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { preConfigure = '' cd build/ ''; - resources = ./resources; installPhase = '' mkdir -p "$prefix/lib/$name" diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png deleted file mode 100644 index 7910e17ebc49a..0000000000000 --- a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png +++ /dev/null Binary files differdiff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png deleted file mode 100644 index f6e881417524f..0000000000000 --- a/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png +++ /dev/null Binary files differdiff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png deleted file mode 100644 index ec8a5f95c6c41..0000000000000 --- a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png +++ /dev/null Binary files differdiff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png deleted file mode 100644 index 3f206cf8b18cf..0000000000000 --- a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png +++ /dev/null Binary files differdiff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml deleted file mode 100644 index 927514dd215bf..0000000000000 --- a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/x-pharo-image"> - <comment>Pharo image file</comment> - <comment xml:lang="fr">Fichier d'image Pharo</comment> - <glob pattern="*.image"/> - <icon name="pharo"/> - </mime-type> -</mime-info> diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 1a24ecd274eed..75ce2ff771c99 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - src = ./resources; + unpackPhase = "true"; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $prefix/lib - cp -R "$src/"* "$prefix/" - unzip ${sources10Zip} -d $prefix/lib/ unzip ${sources20Zip} -d $prefix/lib/ unzip ${sources30Zip} -d $prefix/lib/ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5e45aeb09799c..efc4c824a395c 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.9.5"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a"; + sha256 = "1hdysr9z28sgwv47mivf4iyr1sg19hgfz349dghgdlk3rkl6v0s5"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index d83e2fdbf443f..d71f0b640f9d5 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 4cef66a5c2e9f..591726ea1acea 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,19 +5,19 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.1.0"; + version = "2.2.5"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m"; + sha256 = "1x5c8fiqa18frwwfdsw41lpqsyff3w4lxvjx9d5ccs4zfkhy2q35"; }; # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy six wrapt ] ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast; + ++ lib.optional (!isPyPy) typed-ast; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index b38ce7c91ce12..a9c012ba83146 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "asynctest"; - version = "0.12.4"; + version = "0.13.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ade427a711d18016f35fb0c5d412f0ed63fb074a6084b67ff2dad48f50b0d6ca"; + sha256 = "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62"; }; postPatch = '' diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix new file mode 100644 index 0000000000000..5fee40a941f9b --- /dev/null +++ b/pkgs/development/python-modules/blis/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, cython +, hypothesis +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "blis"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d"; + }; + + nativeBuildInputs = [ + cython + ]; + + + checkInputs = [ + cython + hypothesis + numpy + pytest + ]; + + meta = with stdenv.lib; { + description = "BLAS-like linear algebra library"; + homepage = https://github.com/explosion/cython-blis; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 03a1181a014d6..f90f3f9af75a1 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: +{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: buildPythonPackage rec { pname = "block-io"; - version = "1.1.9"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; + sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BlockIo/block_io-python/commit/8ec0a0cd1afcfcb439d6dc306d8497dd9e4a0993.patch"; - sha256 = "1i6c153wvkr5ncm3cpn34faxvavz534x5kndwn4adlaxlzq30snn"; - }) - ]; - propagatedBuildInputs = [ base58 ecdsa @@ -24,6 +17,11 @@ buildPythonPackage rec { six ]; + preConfigure = '' + substituteInPlace setup.py \ + --replace "ecdsa==0.13" "ecdsa>=0.13" + ''; + # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 268c08ced848d..066d7058fed5d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, @@ -25,21 +25,12 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.1.0"; + version = "2.3.0"; - /*src = fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w"; - };*/ - # Temporarily use GitHub source because PyPi archive is missing some files - # needed for the tests to pass. This has been fixed upstream. - # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d - src = fetchFromGitHub { - owner = "buildbot"; - repo = "buildbot"; - rev = "v${version}"; - sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65"; - } + "/master"; + sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257"; + }; propagatedBuildInputs = [ # core diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 35524040da997..f95d71dc2903d 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.1.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i"; + sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 2f73fbc81a4f5..d15b33912aed2 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v"; + sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39"; }; meta = with lib; { @@ -28,7 +28,7 @@ src = fetchPypi { inherit pname version; - sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h"; + sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -48,7 +48,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27"; + sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -68,7 +68,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya"; + sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -88,7 +88,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c"; + sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index f888448db2189..c8ebdf34b8687 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -2,11 +2,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.1.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps"; + sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 404ead243a989..41c9493922a9b 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements/test.txt \ + --replace "moto==1.3.7" moto \ --replace "pytest>=4.3.1,<4.4.0" pytest ''; diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix new file mode 100644 index 0000000000000..e0317249fe9f8 --- /dev/null +++ b/pkgs/development/python-modules/cgen/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "cgen"; + version = "2017.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a04525d51ee975d37d590d6d82bf80a46e77f75187cccfd2248a89616a778795"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + pytools + numpy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "C/C++ source generation from an AST"; + homepage = https://github.com/inducer/cgen; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix new file mode 100644 index 0000000000000..65d225dc377d9 --- /dev/null +++ b/pkgs/development/python-modules/curio/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, sphinx +}: + +buildPythonPackage rec { + pname = "curio"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "51d1a7b49b4f8dd1486ac785c72d522962e93ccfdcfc1f818f5c7553a307b5ef"; + }; + + disabled = !isPy3k; + + checkInputs = [ pytest sphinx ]; + + # test_aside_basic times out, + # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest + checkPhase = '' + pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel + ''; + + meta = with lib; { + homepage = "https://github.com/dabeaz/curio"; + description = "Library for performing concurrent I/O with coroutines in Python 3"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 477468a0eb391..6f82adc94ca1f 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; + sha256 = "1ragmpihjr9p6n27hw7gy83qyc68csqpn18m9kvwsby1vi7mgdy8"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index bdc31856f338d..73bc143beeb64 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "068zqb3w7nyqiv2hpy0zcpz2xd6xwhq5chigqrp9h9zav7bpr5sp"; + sha256 = "1z9c4ig19hjk18agwljv5ib3pphicg50w9z5zsnqn97q7vnv17gm"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix new file mode 100644 index 0000000000000..8f3065633a1db --- /dev/null +++ b/pkgs/development/python-modules/django/2_2.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, sqlparse, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ; + + propagatedBuildInputs = [ pytz sqlparse ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0bb1e00778a6f..0c87f309489ea 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca"; + sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; }; propagatedBuildInputs = [ faker ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index b79999bba41f8..2204c25e6bced 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -16,23 +16,23 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.5"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "3f2f4570df28df2eb8f39b00520eb610081d6552975e926c6a2cbc64fd89c4c1"; + sha256 = "1jins8jlqyxjwx6i2h2jknwwfpi0bpz1qggvw6xnbxl0g9spyiv0"; }; buildInputs = [ pytestrunner ]; checkInputs = [ email_validator freezegun - mock - more-itertools pytest random2 ukpostcodeparser - ]; + ] + ++ lib.optionals (pythonOlder "3.3") [ mock ] + ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; propagatedBuildInputs = [ dateutil diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix new file mode 100644 index 0000000000000..05034dc75262a --- /dev/null +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -0,0 +1,28 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: + +buildPythonPackage rec { + pname = "fasttext"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastText"; + rev = version; + sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + }; + + buildInputs = [ pybind11 ]; + + propagatedBuildInputs = [ numpy ]; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + description = "Python module for text classification and representation learning"; + homepage = https://fasttext.cc/; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 70538407f2ee6..c44083e4c29a6 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, hypothesis, mock +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest }: buildPythonPackage rec { @@ -20,6 +20,13 @@ buildPythonPackage rec { py.test ''; + patches = [ + # Add Python 3.7 support. Remove with the next release + (fetchpatch { + url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch"; + sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0"; + }) + ]; meta = with stdenv.lib; { description = "A library for automatically generating command line interfaces"; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix new file mode 100644 index 0000000000000..93bf4716073fc --- /dev/null +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, coverage +, dateutil +, freezegun +, mock +, requests-mock +, requests_oauthlib +, sphinx +}: + +buildPythonPackage rec { + pname = "fitbit"; + version = "0.3.0"; + + checkInputs = [ coverage freezegun mock requests-mock sphinx ]; + propagatedBuildInputs = [ dateutil requests_oauthlib ]; + + # The source package on PyPi is missing files required for unit testing. + # https://github.com/orcasgit/python-fitbit/issues/148 + src = fetchFromGitHub { + rev = version; + owner = "orcasgit"; + repo = "python-fitbit"; + sha256 = "0s1kp4qcxvxghqf9nb71843slm4r5lhl2rlvj3yvhbby3cqs4g84"; + }; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace 'Sphinx>=1.2,<1.4' 'Sphinx' \ + --replace 'coverage>=3.7,<4.0' 'coverage' + ''; + + meta = with lib; { + description = "Fitbit API Python Client Implementation"; + license = licenses.asl20; + homepage = https://github.com/orcasgit/python-fitbit; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 92e4542bfef7c..b03f3307d085e 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.10.0"; + version = "0.10.1"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; + sha256 = "0hbp0lrdlzpcdjv1jn2hk98z9gg624nswcm0hi48k4rk28x9xsb9"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix new file mode 100644 index 0000000000000..0a8344f8b9244 --- /dev/null +++ b/pkgs/development/python-modules/genpy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "genpy"; + version = "2016.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91"; + }; + + propagatedBuildInputs = [ + pytools + numpy + ]; + + meta = with lib; { + description = "C/C++ source generation from an AST"; + homepage = https://github.com/inducer/genpy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 291d038258fb2..d59bc5a70b894 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.8"; + version = "1.7.9"; src = fetchPypi { inherit pname version; - sha256 = "0n18frf0ghmwf5lxmkyski4b5h1rsx93ibq3iw0k3s2wxl371406"; + sha256 = "1v551xaavqff085gplinnnrz2sk6sikmm7j47gi0wf34hpba1384"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 199f568322ac3..9d760b37d3796 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "1.9.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7"; + sha256 = "01vcbjsy5zpfd9rzshk2d6150vhb66m5n420j0wd0k0i0p74ya98"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 63c7188f03ac6..2c24d7b9d6a6b 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9"; + sha256 = "0pxcwk5lc8ljil77xqywr0bq1xxj11z92lpfj185ac72d2b1sma5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 82b5880f46585..6ed21597aff06 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , fetchurl }: buildPythonPackage rec { pname = "intelhex"; - version = "2.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0k5l1mn3gv1vb0jd24ygxksx8xqr57y1ivgyj37jsrwpzrp167kw"; + sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; }; patches = [ - (fetchurl { - url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch; - sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9"; + # patch the tests to check for the correct version string (2.2.1) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; + sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; }) ]; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 7ce3122870549..3fa1acb875ab8 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.3"; + version = "6.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1k9701r120gv0an0wxvcjrbmhns8lq3zj6px5y2izly56j2dafqy"; + sha256 = "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix new file mode 100644 index 0000000000000..6274da95b32fb --- /dev/null +++ b/pkgs/development/python-modules/islpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isl +, pytest +, cffi +, six +}: + +buildPythonPackage rec { + pname = "islpy"; + version = "2018.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "be422a53b576210a0bb9775866abb6580b1e568222fc3e4e39d9e82f6d1d7253"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"pytest>=2\"," "" + ''; + + buildInputs = [ isl ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + cffi + six + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Python wrapper around isl, an integer set library"; + homepage = https://github.com/inducer/islpy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6d9d2a6b309f9..db8c5b774e415 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "0.35.4"; + version = "0.35.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "deba0b2803640fcad72c61366bff11d5945173015961586d5e3b2f629ffeb455"; + sha256 = "2ec845845d51221e39d0d753884a19342c953f39febf3148a68631bf57ecb774"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 2e8abf0da525c..494a4f8fc0633 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd"; + sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index a3c084cc8c6f0..e329f36a71693 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -5,34 +5,26 @@ , django , tornado , six -, pytest }: buildPythonPackage rec { pname = "livereload"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "lepture"; repo = "python-livereload"; rev = "v${version}"; - sha256 = "0p3yvvr1iv3fv3pwc2qfzl3mi3b5zv6dh7kmfm1k7krxvganj87n"; + sha256 = "15v2a0af897ijnsfjh2r8f7l5zi5i2jdm6z0xzlyyvp9pxd6mpfm"; }; - buildInputs = [ nose django ]; + buildInputs = [ django ]; propagatedBuildInputs = [ tornado six ]; - # Remove this patch when PR merged - # https://github.com/lepture/python-livereload/pull/173 - postPatch = '' - substituteInPlace tests/test_watcher.py \ - --replace 'watcher.watch(filepath, add_count)' \ - 'add_count.repr_str = "add_count test task"; watcher.watch(filepath, add_count)' - ''; - - checkInputs = [ pytest ]; - checkPhase = "pytest tests"; + checkInputs = [ nose ]; + # TODO: retry running all tests after v2.6.1 + checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; meta = { description = "Runs a local server that reloads as you develop"; diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix new file mode 100644 index 0000000000000..fe765f5ff0a87 --- /dev/null +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, pymbolic +, genpy +, cgen +, islpy +, six +, colorama +, mako +, pyopencl +, pytest +}: + +buildPythonPackage rec { + pname = "loo-py"; + version = "2017.2"; + + src = fetchPypi { + pname = "loo.py"; + inherit version; + sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + pytools + pymbolic + genpy + cgen + islpy + six + colorama + mako + pyopencl + ]; + + # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR + doCheck = false; + checkPhase = '' + HOME=$(mktemp -d) pytest test + ''; + + meta = with lib; { + description = "A code generator for array-based code on CPUs and GPUs"; + homepage = https://mathema.tician.de/software/loopy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix new file mode 100644 index 0000000000000..952740d783765 --- /dev/null +++ b/pkgs/development/python-modules/macropy/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, isPy27 +, pinqSupport ? false, sqlalchemy +, pyxlSupport ? false, pyxl3 +}: + +buildPythonPackage rec { + # https://github.com/lihaoyi/macropy/issues/94 + version = "1.1.0b2"; + pname = "macropy"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "lihaoyi"; + repo = pname; + rev = "v${version}"; + sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf"; + }; + + # js_snippets extra only works with python2 + propagatedBuildInputs = [ ] + ++ lib.optional pinqSupport sqlalchemy + ++ lib.optional pyxlSupport pyxl3; + + checkPhase = '' + ${python.interpreter} run_tests.py + ''; + + meta = with lib; { + homepage = https://github.com/lihaoyi/macropy; + description = "Macros in Python: quasiquotes, case classes, LINQ and more"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 6412e04f93d34..01f80473feef7 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.2"; + version = "0.16.3"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "755e6e930c1ffe3430f62091085f0a51e0817b240986d931014f03b3556fff34"; + sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 093d0d39ddd3c..c5ca8e1f4b571 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k +{ stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k ,mypy_extensions }: buildPythonPackage rec { pname = "mypy"; - version = "0.700"; + version = "0.701"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1zxfi5s9hxrz0hbaj4n513az17l44pxl80r62ipjc0bsmbcic2xi"; + sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p"; }; disabled = !isPy3k; - propagatedBuildInputs = [ lxml typed-ast psutil mypy_extensions ]; + propagatedBuildInputs = [ typed-ast psutil mypy_extensions ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix new file mode 100644 index 0000000000000..d21d9d07150de --- /dev/null +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -0,0 +1,51 @@ +{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, + python, cmake, git, swig, boost, udev, + setuptools, enum34, wrapt, future }: + +buildPythonPackage rec { + pname = "pc-ble-driver-py"; + version = "0.11.4"; + disabled = python.isPy3k; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-ble-driver-py"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + }; + + nativeBuildInputs = [ cmake swig git setuptools ]; + buildInputs = [ boost udev ]; + propagatedBuildInputs = [ enum34 wrapt future ]; + + patches = [ + # build system expects case-insensitive file system + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch"; + sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy"; + }) + ]; + + postPatch = '' + # do not force static linking of boost + sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake + + cd python + ''; + + preBuild = '' + pushd ../build + cmake .. + make -j $NIX_BUILD_CORES + popd + ''; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index bc4c4b20aa4a5..88008cd9530a4 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,23 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, zope_interface +, zope_interface, cffi , sphinx, manuel }: buildPythonPackage rec { pname = "persistent"; - version = "4.4.3"; + version = "4.5.0"; nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "05hi8yfvxl5ns7y7xhbgbqp78ydaxabjp5b64r4nmrfdfsqylrb7"; + sha256 = "0slbvq1m3rilgyhj6i522rsyv592xv9pmvm61mrmgkgf40kfnz69"; }; meta = { description = "Automatic persistence for Python objects"; - homepage = http://www.zope.org/Products/ZODB; + homepage = "http://www.zodb.org/"; + license = lib.licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 9f87d8a16cb0c..4d064af18fa71 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,20 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "pex"; - version = "1.6.6"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "ca887bedc9c6e0eab72fcb4c20eda8fff975d06b75993a85ee1dfc763ba38e86"; + sha256 = "1hg30y8b4b96r4skhz2qmsp7li1izcg8854q3fi48rks0kcfx5fw"; }; - prePatch = '' - substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"' - ''; + nativeBuildInputs = [ setuptools ]; # A few more dependencies I don't want to handle right now... doCheck = false; @@ -24,7 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix new file mode 100644 index 0000000000000..bd00b2f6d5572 --- /dev/null +++ b/pkgs/development/python-modules/piccata/default.nix @@ -0,0 +1,19 @@ +{ buildPythonPackage, fetchPypi, lib, ipaddress }: + +buildPythonPackage rec { + pname = "piccata"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + }; + + propagatedBuildInputs = [ ipaddress ]; + + meta = { + description = "Simple CoAP (RFC7252) toolkit"; + homepage = "https://github.com/NordicSemiconductor/piccata"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 9ce01c098fd40..b66d323114612 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "14cbdyq1s8xmvha3lj942gw478cd6jyhkw8n0mhxpgbz8px9jkfn"; + sha256 = "1icsycqqjj8048a0drj3j75a71yiv2cmijh4w3jf9zxahh3k2c9p"; }; buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix new file mode 100644 index 0000000000000..13f8efbb5813e --- /dev/null +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyatmo"; + version = "1.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "13ca794416707b8cefcb7584bbfff65a4640fcc2510ad73e818fef94d424fca6"; + }; + + # Upstream provides no unit tests. + doCheck = false; + + meta = with lib; { + description = "Simple API to access Netatmo weather station data"; + license = licenses.mit; + homepage = https://github.com/jabesq/netatmo-api-python; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 9b5991a424c98..4d8d0589edae7 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.19.0"; @@ -11,6 +11,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; checkInputs = [ pygccxml ]; + doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k meta = with stdenv.lib; { homepage = https://github.com/gjcarneiro/pybindgen; @@ -19,5 +20,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ teto ]; }; } - - diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6cfb6367307ca..8f1f4378a3942 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.2.3"; + version = "2.3.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "13109caab4972cb6d7395e94ad7189e93e9454f09ededaa6b6784cc5456d41f1"; + sha256 = "1wgzq0da87m7708hrc9h4bc5m4z2p7379i4xyydszasmjns3sgkj"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix new file mode 100644 index 0000000000000..0d13b377b13ed --- /dev/null +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, pytest +, six +, sympy +, pexpect +, symengine +}: + +buildPythonPackage rec { + pname = "pymbolic"; + version = "2018.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a47d5524d6a3cdc8a028079ce632eeb45ceea7243272d234f250622087688207"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"pytest>=2.3\"," "" + ''; + + checkInputs = [ sympy pexpect symengine pytest ]; + propagatedBuildInputs = [ + pytools + six + ]; + + # too many tests fail + doCheck = false; + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "A package for symbolic computation"; + homepage = https://mathema.tician.de/software/pymbolic; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix new file mode 100644 index 0000000000000..7e9414d5207cf --- /dev/null +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, xmltodict +, requests +, ifaddr + +# Test dependencies +, pytest_3, pylint, flake8, graphviz +, mock, sphinx, sphinx_rtd_theme +}: + +buildPythonPackage rec { + pname = "pysonos"; + version = "0.0.13"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0azkbd20qdzdilv5pi4qngw7pjjcsv269dim7xh3qv7s9bp0xik8"; + }; + + propagatedBuildInputs = [ xmltodict requests ifaddr ]; + + checkInputs = [ + pytest_3 pylint flake8 graphviz + mock sphinx sphinx_rtd_theme + ]; + + meta = { + homepage = https://github.com/amelchio/pysonos; + description = "A SoCo fork with fixes for Home Assistant"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ juaningan ]; + }; +} diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix new file mode 100644 index 0000000000000..990e2b28bd89c --- /dev/null +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, future, pyserial, ipaddress }: + +buildPythonPackage rec { + pname = "pyspinel"; + version = "1.0.0a3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0914a662d57a14bce9df21f22711b5c9b2fef37cf461be54ed35c6e229060fd4"; + }; + + propagatedBuildInputs = [ pyserial ipaddress future ]; + + doCheck = false; + + meta = { + description = "Interface to the OpenThread Network Co-Processor (NCP)"; + homepage = "https://github.com/openthread/pyspinel"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix new file mode 100644 index 0000000000000..2f95d7fcecb22 --- /dev/null +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pytricia"; + version = "unstable-2019-01-16"; + + src = fetchFromGitHub { + owner = "jsommers"; + repo = pname; + rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87"; + sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; + }; + + meta = with stdenv.lib; { + description = "A library for fast IP address lookup in Python"; + homepage = https://github.com/jsommers/pytricia; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ mkg ]; + }; +} diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 4227a255ad3de..0e19b971a16c5 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyutilib"; - version = "5.6.5"; + version = "5.7.0"; src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "4730084624be98f2c326da88f3852831c6aa919e11babab2c34b0299c8f5ce2a"; + sha256 = "086fzgjb2mjgkfhg1hvc2gcyam2ab28mijygwica5fg4zz6rn32l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix new file mode 100644 index 0000000000000..159645c425eb4 --- /dev/null +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittest2 +, python +, isPy27 +}: + +buildPythonPackage rec { + pname = "pyxl3"; + version = "1.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "df413d86664e2d261f67749beffff07eb830ab8c7bbe631d11d4c42f3a5e5fde"; + }; + + checkInputs = [ unittest2 ]; + + checkPhase = '' + ${python.interpreter} tests/test_basic.py + ''; + + # tests require weird codec installation + # which is not necessary for major use of package + doCheck = false; + + meta = with lib; { + description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; + homepage = https://github.com/gvanrossum/pyxl3; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 354f2743e984f..1612c31562fbe 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.2.0"; + version = "1.3.1"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qs3xqmi9alahsgr8akzw06ia4c3554dz8pran1h7z5llk262nj4"; + sha256 = "0xvv12q3cwbibim3r97dsz6lbj7xxhlbq7fdm4pznwfzg803cmiv"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index f5a563545a10d..5d825f7579e2f 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,22 +1,22 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3 +, pytest, pytestcov, packaging, hypothesis, boto3, mock }: buildPythonPackage rec { pname = "rasterio"; - version = "1.0.22"; + version = "1.0.23"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; + sha256 = "1xypc86prwkv6ypy87g6r1p5y6d6c51vfxd3z6hjd1hv2ks7zjs1"; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; + checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ]; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index bdbc3629ec710..76fc508a5d828 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.6"; + version = "0.5.7.1"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; + sha256 = "19vnlzma8b0aghdiixk0q3wc10y6306hsnic0qvswaaiki94fss1"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 9893bc5828a0b..f5674c09e0216 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,26 +1,27 @@ { buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars -, pythonOlder +, pythonOlder, pytest, curio }: buildPythonPackage rec { pname = "sniffio"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21"; }; - # breaks with the following error: - # > TypeError: 'encoding' is an invalid keyword argument for this function disabled = !isPy3k; buildInputs = [ glibcLocales ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; - # no tests distributed with PyPI - doCheck = false; + checkInputs = [ pytest curio ]; + + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://github.com/python-trio/sniffio; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a39593bb9e780..80524154f6718 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -17,22 +17,24 @@ , pathlib , msgpack-python , msgpack-numpy +, jsonschema +, blis +, wasabi +, srsly }: buildPythonPackage rec { pname = "spacy"; - version = "2.0.18"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj"; + sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; }; prePatch = '' substituteInPlace setup.py \ - --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ @@ -49,6 +51,10 @@ buildPythonPackage rec { ftfy msgpack-python msgpack-numpy + jsonschema + blis + wasabi + srsly ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 34b8082872b79..d8078c116c2fa 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,78 +1,96 @@ [{ + "pname": "de_core_news_md", + "version": "2.1.0", + "sha256": "0q1flyrp2n8ja11kdlw6x1k0gll0r096pxy8ba4xv15hjng2zay1", + "license": "cc-by-sa-40" +}, +{ "pname": "de_core_news_sm", - "version": "2.0.0", - "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", + "version": "2.1.0", + "sha256": "0fj4dqa915i6niyskxmw2318fxzjhgdjhjx79h9cpp4mxw719w95", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_md", + "version": "2.1.0", + "sha256": "1rgy9hlb92amhlbwkd91yh87xssqj2a1ign0wm59aai69rb79q3s", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_sm", + "version": "2.1.0", + "sha256": "07n7qg0nnzg5gjq7vs72j9qc6z4zjx65qsrrj0hjhiihk3ps378z", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.0.0", - "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "version": "2.1.0", + "sha256": "0ywcczd9nsxmpfwknxa7z54h566bwi7chq0jzx3sqk2a6lva4q52", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.0.0", - "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", + "version": "2.1.0", + "sha256": "10vgq1xd6dpdl7xdssgf0kywbq7xpxp79yqc2vcnl3c4axfpwk5q", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.0.0", - "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", + "version": "2.1.0", + "sha256": "1wg5a7nxq82sfmnc3j5xfr8il65rprmcx2h36va5dvydm1h6icad", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.0.0", - "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", + "version": "2.1.0", + "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.0.0", - "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "version": "2.1.0", + "sha256": "02v7hm711r9ma8p5yk057z7hm2pcvpfjgnjszc697d0ymfn4avby", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.0.0", - "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "version": "2.1.0", + "sha256": "1smyyb1gqp090sailqdqp5v5ww4kf99a3hcd9d9rdhn1wgsv28dh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.0.0", - "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "version": "2.1.0", + "sha256": "0n94ja7y4jbvz0k0x5bij2dypy11ikvgpd9dav0m0hw1wpqgls1i", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.0.0", - "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "version": "2.1.0", + "sha256": "1czr40y5sqs0n2dd4s37kc2xawkh2nsj41wvmsx48bw0aksb1n75", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.0.0", - "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "version": "2.1.0", + "sha256": "1i8dm703mf1l39jwis3mn5mb9azpx6bsimh66iriax94612x64mb", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "2.0.0", - "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "version": "2.1.0", + "sha256": "0ywyn7jprsfr10bvwnm3qk270raxm9s9rvzyp1cp7ca037ab633y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.0.0", - "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "version": "2.1.0", + "sha256": "0vigc9x7158sdqxjgcxgvp6458k5936jlmlp2qdmlmzxr5wmfrbc", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.0.0", - "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", + "version": "2.1.0", + "sha256": "19sfsxwjqdzlfm43gb4hbyj0hgqcfhcfxwdib4g5i1pcfx1v3pf4", "license": "cc-by-sa-40" }] diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix new file mode 100644 index 0000000000000..a3aaa942a9be8 --- /dev/null +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, + jupyter_client, pyzmq }: + +buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + jupyter_client + pyzmq + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Jupyter kernels for Spyder's console"; + homepage = "https://github.com/spyder-ide/spyder-kernels"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 417d5544d6c88..406cd6e8627f2 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,44 +1,21 @@ -{ stdenv, python3, makeDesktopItem }: +{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, + psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, + spyder-kernels, qtpy, pyzmq, chardet }: -let - - spyder-kernels = with python3.pkgs; buildPythonPackage rec { - pname = "spyder-kernels"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; - }; - - propagatedBuildInputs = [ - cloudpickle - ipykernel - wurlitzer - ]; - - # No tests - doCheck = false; - - meta = { - description = "Jupyter kernels for Spyder's console"; - homepage = https://github.com/spyder-ide/spyder-kernels; - license = stdenv.lib.licenses.mit; - }; - }; - -in python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "spyder"; - version = "3.3.3"; + version = "3.3.4"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; + sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels + pygments qtpy pyzmq chardet ]; # There is no test for spyder @@ -54,6 +31,12 @@ in python3.pkgs.buildPythonApplication rec { categories = "Application;Development;Editor;IDE;"; }; + postPatch = '' + # remove dependency on pyqtwebengine + # this is still part of the pyqt 5.11 version we have in nixpkgs + sed -i /pyqtwebengine/d setup.py + ''; + # Create desktop item postInstall = '' mkdir -p $out/share/icons @@ -68,8 +51,9 @@ in python3.pkgs.buildPythonApplication rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = https://github.com/spyder-ide/spyder/; + homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix new file mode 100644 index 0000000000000..ca5909f02f68e --- /dev/null +++ b/pkgs/development/python-modules/srsly/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, mock +, numpy +, pathlib +, pytest +, pytz +}: + +buildPythonPackage rec { + pname = "srsly"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0apgm8znc3k79ifja16fvxsxwgpy3n2fvbp7iwf9szizzpjscylp"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; + + checkInputs = [ + mock + numpy + pytest + pytz + ]; + + # TypeError: cannot serialize '_io.BufferedRandom' object + # Possibly because of sandbox restrictions. + doCheck = false; + + meta = with stdenv.lib; { + description = "Modern high-performance serialization utilities for Python"; + homepage = https://github.com/explosion/srsly; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix new file mode 100644 index 0000000000000..e8e4eb4bf35b6 --- /dev/null +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, arrow +, requests +, units +, pytz +, six +}: + +buildPythonPackage rec { + pname = "stravalib"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; + }; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + arrow + requests + units + pytz + six + ]; + + # tests require network access + # testing strava api + doCheck = false; + + meta = with lib; { + description = "Python library for interacting with Strava v3 REST API"; + homepage = https://github.com/hozn/stravalib; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix new file mode 100644 index 0000000000000..a2c0578f0c7fc --- /dev/null +++ b/pkgs/development/python-modules/symengine/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, cmake +, symengine +, pytest +, sympy +, python +}: + +buildPythonPackage rec { + pname = "symengine"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "symengine"; + repo = "symengine.py"; + rev = "v${version}"; + sha256 = "07i9rwxphi4zgwc7y6f6qvq73iym2cx4k1bpd7rmd3wkpgrrfxqx"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" + + substituteInPlace cmake/FindCython.cmake \ + --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython" + ''; + + buildInputs = [ cython cmake ]; + + checkInputs = [ pytest sympy ]; + + setupPyBuildFlags = [ + "--symengine-dir=${symengine}/" + "--define=\"CYTHON_BIN=${cython}/bin/cython\"" + ]; + + checkPhase = '' + mkdir empty + cd empty + ${python.interpreter} ../bin/test_python.py + ''; + + meta = with lib; { + description = "Python library providing wrappers to SymEngine"; + homepage = https://github.com/symengine/symengine.py; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79ae18d33eaa6..9cb25af7a92ee 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,15 +21,18 @@ , mock , wrapt , dill +, blis +, srsly +, wasabi }: buildPythonPackage rec { pname = "thinc"; - version = "6.12.1"; + version = "7.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich"; + sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ]); propagatedBuildInputs = [ + blis cython cymem msgpack-numpy @@ -48,8 +52,10 @@ buildPythonPackage rec { cytoolz plac six + srsly wrapt dill + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -61,12 +67,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ - --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel" \ - --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ - --replace "msgpack>=0.5.6,<0.6.0" "msgpack" + --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" ''; # Cannot find cython modules. diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix new file mode 100644 index 0000000000000..3a21ce57fe7ab --- /dev/null +++ b/pkgs/development/python-modules/tld/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchPypi, python }: + +python.pkgs.buildPythonPackage rec { + pname = "tld"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp"; + }; + + propagatedBuildInputs = with python.pkgs; [ six ]; + checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ]; + + # https://github.com/barseghyanartur/tld/issues/54 + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + "test_1_update_tld_names" + "test_1_update_tld_names_command" + "test_2_update_tld_names_module" + ]); + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -k '${disabledTests}' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/barseghyanartur/tld; + description = "Extracts the top level domain (TLD) from the URL given"; + license = licenses.lgpl21; + maintainers = with maintainers; [ genesis ]; + }; + +} diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix new file mode 100644 index 0000000000000..02a3fc940aeef --- /dev/null +++ b/pkgs/development/python-modules/units/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "units"; + version = "0.07"; + + src = fetchPypi { + inherit pname version; + sha256 = "43eb3e073e1b11289df7b1c3f184b5b917ccad178b717b03933298716f200e14"; + }; + + meta = with lib; { + description = "Python support for quantities with units"; + homepage = https://bitbucket.org/adonohue/units/; + license = licenses.psfl; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix new file mode 100644 index 0000000000000..01a9a4034d598 --- /dev/null +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "wasabi"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest wasabi/tests + ''; + + meta = with stdenv.lib; { + description = "A lightweight console printing and formatting toolkit"; + homepage = https://github.com/ines/wasabi; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix new file mode 100644 index 0000000000000..e5597e7aea896 --- /dev/null +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -0,0 +1,67 @@ +{ buildPythonPackage, + fetchPypi, + cairosvg, + pyphen, + cffi, + cssselect, + lxml, + html5lib, + tinycss, + pygobject2, + glib, + pango, + fontconfig, + stdenv, + pytest, + pytestrunner, + pytest-isort, + pytest-flake8, + pytestcov, + isPy3k, + substituteAll +}: + +buildPythonPackage rec { + pname = "weasyprint"; + version = "45"; + disabled = !isPy3k; + + # ignore failing pytest + checkPhase = "pytest -k 'not test_font_stretch'"; + + # ignore failing flake8-test + prePatch = '' + substituteInPlace setup.cfg \ + --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' + ''; + + checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + + FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; + + patches = [ + (substituteAll { + src = ./library-paths.patch; + fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; + pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + src = fetchPypi { + inherit version; + pname = "WeasyPrint"; + sha256 = "04bf2p2x619g4q4scg8v6v57c24vwn7qckvz81rckj8clzifyr82"; + }; + + meta = with stdenv.lib; { + homepage = https://weasyprint.org/; + description = "Converts web documents to PDF"; + license = licenses.bsd3; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch new file mode 100644 index 0000000000000..eabbdbdcd6ee9 --- /dev/null +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -0,0 +1,38 @@ +diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py +index 377716c1..2016e01c 100644 +--- a/weasyprint/fonts.py ++++ b/weasyprint/fonts.py +@@ -48,11 +48,8 @@ else: + # with OSError: dlopen() failed to load a library: cairo / cairo-2 + # So let's hope we find the same file as cairo already did ;) + # Same applies to pangocairo requiring pangoft2 +- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig', +- 'libfontconfig-1.dll', +- 'libfontconfig.so.1', 'libfontconfig-1.dylib') +- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', +- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') ++ fontconfig = dlopen(ffi, '@fontconfig@') ++ pangoft2 = dlopen(ffi, '@pangoft2@') + + ffi.cdef(''' + // FontConfig +diff --git a/weasyprint/text.py b/weasyprint/text.py +index 035074e9..08e40395 100644 +--- a/weasyprint/text.py ++++ b/weasyprint/text.py +@@ -243,12 +243,9 @@ def dlopen(ffi, *names): + return ffi.dlopen(names[0]) # pragma: no cover + + +-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', +- 'libgobject-2.0.dylib') +-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', +- 'libpango-1.0.dylib') +-pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', +- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') ++gobject = dlopen(ffi, '@gobject@') ++pango = dlopen(ffi, '@pango@') ++pangocairo = dlopen(ffi, '@pangocairo@') + + gobject.g_type_init() + diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 8287c05f743b3..94e8fc977e06d 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -1,24 +1,24 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: +{ lib, buildPythonPackage, fetchFromGitHub +, pytest_3 }: buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.24"; + version = "4.4.27"; - - src = fetchPypi { - inherit pname version; - sha256 = "900b28cc5e96be4091d8778f19f222832890264e338765a1c1c09fca2db64b2d"; + src = fetchFromGitHub { + owner = "dwolfhub"; + repo = pname; + rev = "v${version}"; + sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; }; - # No tests in archive - doCheck = false; + checkInputs = [ + pytest_3 + ]; meta = { description = "Python implementation of Dropbox's realistic password strength estimator, zxcvbn"; homepage = https://github.com/dwolfhub/zxcvbn-python; license = with lib.licenses; [ mit ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 05c3edc66d62a..a7c94601dd88b 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.6"; + version = "1.6.7"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1w4vk8zq57b6flp2cpjlkicz4h8bca215669w065zqhfxlpxma2g"; + sha256 = "0d7iqgyvsyl8m02bwcsvp11q73xcsvzwwipjzlbqrgi0jivf34pw"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 90eeffd58da16..78a4396698b60 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.5.0"; - source.sha256 = "0c11i01yw87fssmwbybaqf5rdxsjp44hvxdw54c3iqb8fvj76b68"; + version = "4.5.1"; + source.sha256 = "0vqnhlswvrg5fpxszfkjmla85gdlvgspz0whlli730ydx648mi68"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 390c0e4413341..a5e6ed3d2ddb4 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.98.1"; + version = "0.99.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1ik758ca6mfybnzb987fa8blqaskqbfk5hkzl4yg1j08p7kli5ll"; + sha256 = "0afm3mz2b4aivqm3hbp6kc7d7a5v89r13x7dahzhf7l21qjv3mz5"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 6544046b16d22..89ffbff3db719 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -5,24 +5,24 @@ fetchFromGitHub, kconfigwidgets, ki18n, + kio, kitemmodels, kitemviews, + kwindowsystem, libelf, qtbase, threadweaver, }: stdenv.mkDerivation rec { - name = "hotspot-${version}"; - version = "1.0.0"; # don't forget to bump `rev` below when you change this + pname = "hotspot"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; - # TODO: For some reason, `fetchSubmodules` doesn't work when using `rev = "v${version}";`, - # so using an explicit commit instead. See #15559 - rev = "352687bf620529e9887616651f123f922cb421a4"; - sha256 = "09ly15yafpk31p3w7h2xixf1xdmx803w9fyb2aq7mhmc7pcxqjsx"; + rev = "v${version}"; + sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; fetchSubmodules = true; }; @@ -32,8 +32,10 @@ stdenv.mkDerivation rec { extra-cmake-modules kconfigwidgets ki18n + kio kitemmodels kitemviews + kwindowsystem libelf qtbase threadweaver diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 51e8d12d31472..5999525def08d 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.3.13"; + version = "2.4.0"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z"; + sha256 = "0r5mhacn8v4b2kjni91nxh3b6g86cbkrnlk4f6sj4mdrvx25dp39"; }; nativeBuildInputs = [ cmake ]; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat maintainers.babariviere ]; + maintainers = [ maintainers.babariviere ]; }; } diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 002d90e3f1f8d..9d429ab9ba315 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,14 +3,15 @@ , go-md2man }: let - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { - rev = "v${version}"; - owner = "containers"; - repo = "buildah"; - sha256 = "1w8w10pw5mpr3lc78z2dx3vck40cl7s3zsizsxhs0a9kxnfp01j9"; + rev = "v${version}"; + owner = "containers"; + repo = "buildah"; + sha256 = "1r91ndnc3ysrfdjybsnlnbkw26n25mfwc9i8ys5y3c26fq8ic3zd"; }; + goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index aea94633bae36..653d0d4505e7a 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -2,37 +2,39 @@ , pythonPackages , cmake , llvmPackages +, libffi, libxml2, zlib , withMan ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "CastXML"; - version = "20180403"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "CastXML"; - repo = "CastXML"; - rev = "c2a44d06d9379718292b696f4e13a2725ff9d95e"; - sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1qpgr5hyb692h7l5igmq53m6a6vi4d9qp8ks893cflfx9955h3ip"; }; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + cmakeFlags = [ "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; buildInputs = [ - cmake llvmPackages.clang-unwrapped llvmPackages.llvm - ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + libffi libxml2 zlib + ]; - propagatedbuildInputs = [ llvmPackages.libclang ]; + propagatedBuildInputs = [ llvmPackages.libclang ]; - # 97% tests passed, 96 tests failed out of 2866 + # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all - doCheck=false; + doCheck = false; checkPhase = '' # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.kitware.com; + homepage = "https://github.com/CastXML/CastXML"; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; platforms = platforms.unix; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index c0fa754e1e9d5..b312b888e908c 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -6,13 +6,13 @@ with rustPlatform; buildRustPackage rec { pname = "chit"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "peterheesterman"; repo = pname; rev = version; - sha256 = "1qp5ad83lvfz9l4ihz1l500p8bgf7q0z1k4f3i13nd5n7i3ksdjc"; + sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv"; }; cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw"; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 929dfc61ba331..7813eba043619 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,38 +1,32 @@ { mkDerivation, lib, fetchFromGitHub, cmake, antlr -, qtbase, qttools, qscintilla, sqlite }: +, qtbase, qttools, sqlite }: mkDerivation rec { - version = "3.10.1"; - name = "sqlitebrowser-${version}"; + version = "3.11.2"; + pname = "sqlitebrowser"; src = fetchFromGitHub { - repo = "sqlitebrowser"; - owner = "sqlitebrowser"; + repo = pname; + owner = pname; rev = "v${version}"; - sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; + sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; }; - buildInputs = [ qtbase qscintilla sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake antlr qttools ]; + # Use internal `qscintilla` rather than our package to fix the build + # (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936). + # This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged. + cmakeFlags = [ "-DFORCE_INTERNAL_QSCINTILLA=ON" ]; + NIX_LDFLAGS = [ "-lQt5PrintSupport" ]; enableParallelBuilding = true; - # We have to patch out Test and PrintSupport to make this work with Qt 5.9 - # It can go when the application supports 5.9 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace Test "" \ - --replace PrintSupport "" - - substituteInPlace libs/qcustomplot-source/CMakeLists.txt \ - --replace PrintSupport "" - ''; - meta = with lib; { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index d2db1f1a2a699..f087059895635 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,8 +1,8 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { +buildGoModule rec { name = "golangci-lint-${version}"; - version = "1.9.2"; + version = "1.16.0"; goPackagePath = "github.com/golangci/golangci-lint"; subPackages = [ "cmd/golangci-lint" ]; @@ -11,14 +11,16 @@ buildGoPackage rec { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0r05j6ayk5778fkd5r1sgcwq675ra0vq82lqs125g70291ryha08"; + sha256 = "1yzcfmrxyrxhq3vx13qm7czvhvdnaqay75v8ry1lgpg0bnh9pakx"; }; + modSha256 = "1dsaj6qsac9y4rkssjbmk46vaqbblzdim2rbdh3dgn1m0vdpv505"; + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; license = licenses.agpl3; platforms = platforms.unix; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ anpryl manveru ]; }; } diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index f02105aede971..3a2040e712a9a 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,18 +4,19 @@ with stdenv.lib; buildGoPackage rec { name = "kind-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { - rev = "${version}"; + rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "14ddhml9rh7x4j315fb332206xbn1rzx3i0ngj3220vb6d5dv8if"; + sha256 = "1azl5knw1n7g42xp92r9k7y4rzwp9xx0spcldszrpry2v4lmc5sb"; }; # move dev tool package that confuses the go compiler patchPhase = "rm -r hack"; + goDeps = ./deps.nix; goPackagePath = "sigs.k8s.io/kind"; excludedPackages = "images/base/entrypoint"; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix new file mode 100644 index 0000000000000..1681fe9e2eb45 --- /dev/null +++ b/pkgs/development/tools/kind/deps.nix @@ -0,0 +1,507 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad4578"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "v0.17.0"; + sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "v0.17.0"; + sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "v0.19.0"; + sha256 = "1527dbn74c0gw9gib5lmdr5vjgp5h57r1j92c3wh37irz90vnb6a"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "v0.17.0"; + sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.1"; + sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "4bd1920723d7"; + sha256 = "0z21hxin616xvkv075vdz416zm36qs0mbi76526l9yz8khbg7jmr"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "68f4ded48ba9"; + sha256 = "0l6qkbpmy2qd0q8h7dghhv27qjngll739kzm389qdbjxj3inq2dl"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.1.0"; + sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/munnerz/goautoneg"; + fetch = { + type = "git"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "11459a886d9c"; + sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "dcabb60a477c"; + sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.1"; + sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3ec191127204"; + sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "1f849cf54d09"; + sha256 = "19a3srk9dcqad3sqd8mfg36pbaxcfkbzhp3jinhqxnzd90bds6am"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "6e4e0e4f393b"; + sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "6a84e37a896d"; + sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "v11.0.0"; + sha256 = "006007k55b5q95fa0vih4bprwvx5sk4a5chvsn46baqa5znphyn1"; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v0.3.0"; + sha256 = "05lp8ddqnbypgszv3ra7x105qpr8rr1g4rk2148wcmgfjrfhw437"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "a01b7d5d6c22"; + sha256 = "182s6gqhzal5602dfyk9h8adsdqgh5fmgh0bifksp1x856v4aizx"; + }; + } + { + goPackagePath = "sigs.k8s.io/kustomize"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/kustomize"; + rev = "v2.0.3"; + sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "ea680f03cc65"; + sha256 = "1drc908qcvwifvbz12vxahplycnaj177pz5ay6ygbn3q8824qv7b"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "v1.0.0"; + sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128cc"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "9f3314589c9a"; + sha256 = "13rr34jmgisgy8mc7yqz3474w4qbs01gz4b7zrgkvikdv4a6py3h"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "8fab8cb257d5"; + sha256 = "0ckkl9zj8c0p5csfgsnvgb3vm91l2zgxgxhbjcf3ds3wryljalyj"; + }; + } +] diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch new file mode 100644 index 0000000000000..5458a0d93bff3 --- /dev/null +++ b/pkgs/development/tools/misc/indent/darwin.patch @@ -0,0 +1,15 @@ +diff --git a/config.h.in b/config.h.in +index 07e6fce..0c57e2a 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -432,8 +432,8 @@ + # endif + # define _GL_EXTERN_INLINE extern + #else +-# define _GL_INLINE static _GL_UNUSED +-# define _GL_EXTERN_INLINE static _GL_UNUSED ++# define _GL_INLINE static ++# define _GL_EXTERN_INLINE static + #endif + + #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 996043c16d874..c4b5fecca7411 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "indent-2.2.10"; + name = "indent-2.2.12"; src = fetchurl { url = "mirror://gnu/indent/${name}.tar.gz"; - sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"; + sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c - ''; + patches = [ ./darwin.patch ]; + + buildInputs = [ texinfo ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + "-Wno-implicit-function-declaration"; hardeningDisable = [ "format" ]; meta = { - homepage = https://www.gnu.org/software/indent/; + homepage = "https://www.gnu.org/software/indent/"; description = "A source code reformatter"; license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.mmahut ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix new file mode 100644 index 0000000000000..0a6155e649e59 --- /dev/null +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -0,0 +1,33 @@ +{ stdenv, python2Packages, fetchFromGitHub }: + +with python2Packages; buildPythonApplication rec { + pname = "nrfutil"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-nrfutil"; + rev = "v${version}"; + sha256 = "1hajjgz8r4fjbwqr22p5dvb6k83dpxf8k7mhx20gkbrrx9ivqh79"; + }; + + propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa + protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; + + checkInputs = [ nose behave ]; + + postPatch = '' + # remove version bound on pyyaml + sed -i /pyyaml/d requirements.txt + + mkdir test-reports + ''; + + meta = with stdenv.lib; { + description = "Device Firmware Update tool for nRF chips"; + homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 0c5ec64042606..29d713a9af442 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "0.10-pre-20180509"; + version = "0.10-pre-20190328"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69"; - sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr"; + rev = "e1e39f3639e39360ceebb2f7ed533cede4623070"; + sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k"; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 779f6c76fef95..19e4423f7d866 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -26,13 +26,13 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.28"; + version = "1.2.18"; name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "0apq8hmn39k0ads4xy8iyy9rp8bvia60mh7a944rk1gjpqv227g5"; + sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 28500ee08eee1..965f0ed096cde 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; # Make sure the Flex-generated files are newer than the `.l' files, so that @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc" ''; + postInstall = '' + for w in "$out/bin"/*; do + isScript "$w" || continue + wrapProgram "$w" --prefix PATH : "$out/bin" + done + ''; + meta = { description = "Set of tools for counting physical Source Lines of Code (SLOC)"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index c3553d0498189..49b12b60b1469 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"; + sha256 = "12wsga1v3rab24gr0mpfip7j7gwr90m8f9h6fviqxa3xgnwl38zm"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index f9b4343a63a7f..de60d91bf8371 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -13,7 +13,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4"; - buildInputs = [ libiconv ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security + ]; meta = with stdenv.lib; { description = "Program that displays statistics about your code"; diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix new file mode 100644 index 0000000000000..0c6e4f568ffce --- /dev/null +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python3, fetchFromGitHub, clang-unwrapped }: + +python3.pkgs.buildPythonApplication rec { + pname = "whatstyle"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "mikr"; + repo = pname; + rev = "v${version}"; + sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm"; + }; + + # Fix references to previous version, to avoid confusion: + postPatch = '' + substituteInPlace setup.py --replace 0.1.6 ${version} + substituteInPlace ${pname}.py --replace 0.1.6 ${version} + ''; + + checkInputs = [ clang-unwrapped /* clang-format */ ]; + + doCheck = false; # 3 or 4 failures depending on version, haven't investigated. + + meta = with stdenv.lib; { + description = "Find a code format style that fits given source files"; + homepage = https://github.com/mikr/whatstyle; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 75e898fdb3fd7..f91ae7132005d 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; name = "${pname}-${version}"; - version = "3.1.0"; + version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec src = fetchurl { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; }; meta = { diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5e54a8b370585..162ac045a9de8 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.3"; + version = "1.4.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; + sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix new file mode 100644 index 0000000000000..47b426604da0d --- /dev/null +++ b/pkgs/development/tools/pgloader/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: +stdenv.mkDerivation rec { + pname = "pgloader"; + version = "3.6.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; + sha256 = "1sm8xmq30d1biin5br0y3vrv4fydbrzfqglz1hnvrkdyxrg7d6f9"; + }; + + nativeBuildInputs = [ git makeWrapper ]; + buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; + + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; + + buildPhase = '' + export PATH=$PATH:$out/bin + export HOME=$TMPDIR + + make pgloader + ''; + + dontStrip = true; + enableParallelBuilding = false; + + installPhase = '' + install -Dm755 bin/pgloader "$out/bin/pgloader" + wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" + ''; + + meta = with stdenv.lib; { + homepage = https://pgloader.io/; + description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.postgresql; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b6ba02633ac0f..421aeb9ad91c3 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.14"; + version = "0.0.25"; src = fetchPypi { inherit pname version; - sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g"; + sha256 = "f6857cdc3c53c8ce9ba7a560c2759c10b988f3d9fafde912d3fa4deecb4d4664"; }; propagatedBuildInputs = [ pyserial pyudev ]; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d6c5718d3ec69..0bf1c61c9598d 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; + sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x"; }; - cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; + cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11"; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { '') ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { homepage = https://www.rustup.rs/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 5598dc1606d98..db4d9dcd1aca2 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, libsass }: +{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { - name = "sassc-${version}"; - version = "3.5.0"; + pname = "sassc"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2"; }; patchPhase = '' diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 417f0a749c986..cf31d0ad93429 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.28.0"; - # rev is the 0.28.0 commit, mainly for skaffold version command output - rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339"; + version = "0.29.0"; + # rev is the 0.29.0 commit, mainly for skaffold version command output + rev = "1bbf9a3f13094e58c90399a4bd7e07250e0d2da5"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw"; + sha256 = "1rf23f7cwmmsycwdyk09wsrsq20vbzg2pi44r3516qsaz7x98mf1"; }; meta = { diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 8f3df66ec37ff..3e8a228bacf18 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0fb0vkmn5fv4mwk6riw08hb3vsh1pivvrfwm90b95yhksq4pfi12"; + sha256 = "0ij9br4z9h8qay6l41sicr4lbjc38hxsn3lgjrj9zpn2b3585syx"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index b0dc2ba041af0..5ccb42ea4177c 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "kore-${version}"; - version = "2.0.0"; + pname = "kore"; + version = "3.3.0"; src = fetchFromGitHub { owner = "jorisvink"; - repo = "kore"; + repo = pname; rev = "${version}-release"; - sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; + sha256 = "19jd1jkyrylvqbrxdz7i3xvymwi1dzx97iq6fcp76fw7nm7gxgk4"; }; buildInputs = [ openssl ]; - postPatch = '' - # Do not require kore to be on PATH when it launches itself as a subprocess. - sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c - ''; - - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; # added to fix build w/gcc7 and clang5 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index e63f609fc2b6c..76434809cb520 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,18 +1,24 @@ -{ buildGoPackage, fetchFromGitHub }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { - name = "minify-${version}"; - version = "v2.0.0"; - rev = "41f3effd65817bac8acea89d49b3982211803a4d"; +buildGoModule rec { + pname = "minify"; + version = "2.5.0"; goPackagePath = "github.com/tdewolff/minify"; src = fetchFromGitHub { - inherit rev; owner = "tdewolff"; - repo = "minify"; - sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq"; + repo = pname; + rev = "v${version}"; + sha256 = "1ja26fs7klzggmfqvz5nzj9icaa8r8h4a91qg8rj4gx5cnvwx38d"; }; - goDeps = ./deps.nix; + modSha256 = "0kff2nj66bifbfi8srcvcsipbddw43mvjdwlq0lz04qak524pbvr"; + + meta = with lib; { + description = "Minifiers for web formats"; + license = licenses.mit; + homepage = https://go.tacodewolff.nl/minify; + platforms = platforms.all; + }; } diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix deleted file mode 100644 index 4efaec46d571e..0000000000000 --- a/pkgs/development/web/minify/deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; - sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; - }; - } - { - goPackagePath = "github.com/tdewolff/buffer"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/buffer"; - rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5"; - sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "34d5c1160d4503da4b456e5094609f2331d6dde3"; - sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"; - }; - } - { - goPackagePath = "github.com/tdewolff/strconv"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/strconv"; - rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3"; - sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"; - }; - } - { - goPackagePath = "github.com/matryer/try"; - fetch = { - type = "git"; - url = "https://github.com/matryer/try"; - rev = "93d30e50512f879b73829eb79867df38084bcd31"; - sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; - sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; - }; - } -] diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 66133b432eed4..06eb3e45e6fcd 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.2.0"; - sha256 = "10vr8yqrvdmcaszg7l7cjchzzik709vcygcnpkjf2sjhz929glf5"; + version = "12.3.1"; + sha256 = "1zhb5nq9s6cshbm6lf7qsy310fcsiy9wdr869vs6hw76zyn50axs"; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index b29add5d05796..cf877521144a5 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.15.1"; - sha256 = "1ldd4p7cf7bjl4yg9d91khzd9662g3wda7g1yr0ljqjjyjiqcr3b"; + version = "8.16.0"; + sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m"; } diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix new file mode 100644 index 0000000000000..5ae656d1fc182 --- /dev/null +++ b/pkgs/games/flare/default.nix @@ -0,0 +1,24 @@ +{ lib, buildEnv, callPackage, makeWrapper }: + +buildEnv { + name = "flare-1.10"; + + paths = [ + (callPackage ./engine.nix {}) + (callPackage ./game.nix {}) + ]; + + buildInputs = [ makeWrapper ]; + postBuild = '' + mkdir -p $out/bin + makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare" + ''; + + meta = with lib; { + description = "Fantasy action RPG using the FLARE engine"; + homepage = "http://flarerpg.org/"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.gpl3 licenses.cc-by-sa-30 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix new file mode 100644 index 0000000000000..8b620835f8571 --- /dev/null +++ b/pkgs/games/flare/engine.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf }: + +stdenv.mkDerivation rec { + pname = "flare-engine"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "flareteam"; + repo = pname; + rev = "v${version}"; + sha256 = "0fm7jmxl86h8199nazdi9ivsrhcv9gcymhz1l5c6l2f4d0aqdqiq"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]; + + meta = with stdenv.lib; { + description = "Free/Libre Action Roleplaying Engine"; + homepage = "https://github.com/flareteam/flare-engine"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.gpl3 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix new file mode 100644 index 0000000000000..b10d7dfedb0f3 --- /dev/null +++ b/pkgs/games/flare/game.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "flare-game"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "flareteam"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfra4ww8za08vcgza2jvh3jrwi6zryk4ljyj32lpp9v4ws9hdh4"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Fantasy action RPG using the FLARE engine"; + homepage = "https://github.com/flareteam/flare-game"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.cc-by-sa-30 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 200b9da4a7eba..b0d1f2a5455e2 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -3,7 +3,7 @@ */ { stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper , lua, mono, dotnetPackages, python -, libGL, openal, SDL2 +, libGL, freetype, openal, SDL2 , zenity }: @@ -11,7 +11,7 @@ with stdenv.lib; let path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); - rpath = makeLibraryPath [ lua openal SDL2 ]; + rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { } ./mkdirp.sh; in { @@ -54,10 +54,7 @@ in { StyleCopMSBuild StyleCopPlusMSBuild ] ++ [ - lua libGL - openal - SDL2 ]; # TODO: Test if this is correct. diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 7454d32c11394..2bdbce6d939d4 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -22,20 +22,20 @@ let in { release = name: (buildUpstreamOpenRAEngine rec { - version = "20181215"; + version = "20190314"; rev = "${name}-${version}"; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; } name); playtest = name: (buildUpstreamOpenRAEngine rec { - version = "20190106"; + version = "20190302"; rev = "${name}-${version}"; - sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; + sha256 = "1vqvfk2p2lpk3m0d3rpvj34i8cmk3mfc7w4cn4llqd9zp4kk9pya"; } name); bleed = buildUpstreamOpenRAEngine { - version = "9c9cad1"; - rev = "9c9cad1a15c3a34dc2a61b305e4a9a735381a5f8"; - sha256 = "0100p7wrnnlvkmy581m0gbyg3cvi4i1w3lzx2gq91ndz1sbm8nd2"; + version = "8ee1102"; + rev = "8ee11028d72cde7556b31d45f556b40be65b4b70"; + sha256 = "0f1fpf37ms8d7fhlh3rjzsxsk9w23iyi3phs2i7g561292d5rk3l"; }; } diff --git a/pkgs/games/openra/mod-launch-game.sh b/pkgs/games/openra/mod-launch-game.sh index c0b6feb69c883..88b53e71e1bc4 100644 --- a/pkgs/games/openra/mod-launch-game.sh +++ b/pkgs/games/openra/mod-launch-game.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash show_error() { if command -v zenity > /dev/null; then zenity --no-wrap --no-markup --error --title "OpenRA - @title@" --text "$1" 2>/dev/null @@ -12,7 +12,7 @@ cd "@out@/lib/openra-@name@" # Check for missing assets assetsError='@assetsError@' -if [ -n "$assetsError" -a ! -d "$HOME/.openra/Content/@name@" ]; then +if [[ -n "$assetsError" && ! -d "$HOME/.openra/Content/@name@" ]]; then show_error "$assetsError" fi @@ -20,6 +20,6 @@ fi mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra-@name@" Engine.ModSearchPaths="@out@/lib/openra-@name@/mods" "$@" # Show a crash dialog if something went wrong -if [ $? -ne 0 -a $? -ne 1 ]; then +if (( $? != 0 && $? != 1 )); then show_error $'OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs' fi diff --git a/pkgs/games/openra/mod-update.sh b/pkgs/games/openra/mod-update.sh index 52bcada8f9a15..8489d5a97a7cc 100755 --- a/pkgs/games/openra/mod-update.sh +++ b/pkgs/games/openra/mod-update.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC2034 # for mod in $(nix eval --raw '( # with import <nixpkgs> { }; @@ -9,9 +10,7 @@ # ./mod-update.sh "$mod" # done -# Uses: -# https://github.com/msteen/nix-prefetch -# https://github.com/msteen/nix-update-fetch +# Uses: https://github.com/msteen/nix-upfetch mod=$1 commit_count=$2 @@ -19,7 +18,7 @@ token= nixpkgs='<nixpkgs>' die() { - ret=$? + local ret=$? echo "$*" >&2 exit $ret } @@ -34,13 +33,16 @@ get_sha1() { curl -H "Authorization: token $token" -H 'Accept: application/vnd.github.VERSION.sha' "https://api.github.com/repos/$owner/$repo/commits/$ref" } +[[ -n $mod ]] || die "The first argument of this script has to be a mod identifier." + [[ -n $token ]] || die "Please edit this script to include a GitHub API access token, which is required for API v4: https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/" # Get current mod_owner and mod_repo. -vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --skip-hash > >( +vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --no-compute-hash > >( jq --raw-output 'with_entries(select(.value | contains("\n") | not)) | to_entries | .[] | .key + "=" + .value')) || exit +mod_owner=; mod_repo=; mod_rev= while IFS='=' read -r key val; do declare "mod_${key}=${val}" done <<< "$vars" @@ -65,11 +67,12 @@ else }' fi -query='query { - repository(owner: \"'"$mod_owner"'\", name: \"'"$mod_repo"'\") { +# shellcheck disable=SC2089 +query='{ + repository(owner: "'$mod_owner'", name: "'$mod_repo'") { defaultBranchRef { target { - ... on Commit '"$query_on_commit"' + ... on Commit '$query_on_commit' } } licenseInfo { @@ -80,7 +83,9 @@ query='query { # Newlines are not allowed in a query. # https://developer.github.com/v4/guides/forming-calls/#communicating-with-graphql +# shellcheck disable=SC2086 disable=SC2090 disable=SC2116 query=$(echo $query) +query=${query//\"/\\\"} # https://developer.github.com/v4/guides/using-the-explorer/#configuring-graphiql json=$(curl -H "Authorization: bearer $token" -X POST -d '{ "query": "'"$query"'" }' https://api.github.com/graphql) || exit @@ -99,12 +104,14 @@ vars=$(jq --raw-output '.data.repository | { rev: .oid, }) | to_entries | .[] | .key + "=" + (.value | tostring)' <<< "$json") || exit +mod_license_key=; mod_version=; mod_rev= while IFS='=' read -r key val; do declare "mod_${key}=${val}" done <<< "$vars" mod_config=$(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/mod.config") || exit +mod_id=; engine_version=; automatic_engine_management=; automatic_engine_source= while IFS='=' read -r key val; do declare "${key,,}=$(jq --raw-output . <<< "$val")" done < <(grep '^\(MOD_ID\|ENGINE_VERSION\|AUTOMATIC_ENGINE_MANAGEMENT\|AUTOMATIC_ENGINE_SOURCE\)=' <<< "$mod_config") @@ -116,6 +123,7 @@ echo >&2 [[ $mod_id == "$mod" ]] || die "The mod '$mod' reports being mod '$mod_id' instead." +# shellcheck disable=SC2005 disable=SC2046 [[ $mod_license_key == gpl-3.0 ]] || [[ $(echo $(head -2 <(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/COPYING"))) == 'GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007' ]] || die "The mod '$mod' is licensed under '$mod_license_key' while expecting 'gpl-3.0'." @@ -126,6 +134,7 @@ echo >&2 engine_owner=${BASH_REMATCH[1]} engine_repo=${BASH_REMATCH[2]} +# shellcheck disable=SC2016 [[ ${BASH_REMATCH[3]} == '${ENGINE_VERSION}' ]] || engine_version=${BASH_REMATCH[3]} engine_rev=$(get_sha1 "$engine_owner" "$engine_repo" "$engine_version") @@ -146,6 +155,6 @@ for type in mod engine; do done var="${type}_version" version=${!var} - nix-update-fetch --yes --version "$version" "$(nix-prefetch --quiet --file "$nixpkgs" "openraPackages.mods.$mod" --index $i --output json --with-position --diff -- "${fetcher_args[@]}")" + nix-upfetch --yes --version "$version" "$(nix-preupfetch --file "$nixpkgs" "openraPackages.mods.$mod" --index $i -- "${fetcher_args[@]}")" (( i++ )) done diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index ddc34dbda8f68..1e81e02e59f15 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -60,23 +60,23 @@ in { }; dr = buildOpenRAMod rec { - version = "266.git.920b476"; + version = "324.git.ffcd6ba"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/drogoganor/DarkReign; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; - rev = "920b476be1b7751db087f1f7acd504b8a048d1e2"; - sha256 = "11ir4pnichrnv4z9532fp9g166jl8fvy5kk03a2fgxssp3g40zz2"; + rev = "ffcd6ba72979e5f77508136ed7b0efc13e4b100e"; + sha256 = "07g4qw909649s3i1yhw75613mpwfka05jana5mpp5smhnf0pkack"; }; engine = { version = "DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "OpenRA" ; - rev = "e08b75c2add30439228ea3dd61d6be60d1800329"; - sha256 = "125vf962p69ajrh5pxgfwsi0ksczqwvlw5kn2fvffiwvh8d5in23"; + rev = "f91d3f2603bbf51afaa89357e4defcdc36138102"; + sha256 = "05g900ri6q0zrkrk8rmjaz576vjggmi2y6jm0xz3cwli54prn11w"; name = "engine"; inherit extraPostFetch; }; @@ -161,15 +161,15 @@ in { }; ra2 = buildOpenRAMod rec { - version = "881.git.b37f4f9"; + version = "903.git.2f7c700"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/OpenRA/ra2; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; - rev = "b37f4f9f07404127062d9061966e9cc89dd86445"; - sha256 = "1jiww66ma3qdk9hzyvhbcaa5h4p2mxxk22kvrw92ckpxy0bqba3h"; + rev = "2f7c700d6d63c0625e7158ef3098221fa6741569"; + sha256 = "11vnzwczn47wjfrq6y7z9q234p27ihdrcl5p87i6h2xnrpwi8b6m"; }; engine = rec { version = "release-20180923"; @@ -189,23 +189,23 @@ in { }; raclassic = buildOpenRAMod { - version = "181.git.8240890"; + version = "183.git.c76c13e"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; homepage = https://github.com/OpenRA/raclassic; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; - rev = "8240890b32191ce34241c22158b8a79e8c380879"; - sha256 = "0dznyb6qa4n3ab87g1c4bihfc2nx53k6z0kajc7ynjdnwzvx69ww"; + rev = "c76c13e9f0912a66ddebae8d05573632b19736b2"; + sha256 = "1cnr3ccvrkjlv8kkdcglcfh133yy0fkva9agwgvc7wlj9n5ydl4g"; }; engine = rec { - version = "playtest-20190106"; + version = "release-20190314"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; rev = version; - sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; inherit extraPostFetch; }; @@ -242,24 +242,24 @@ in { }; sp = unsafeBuildOpenRAMod { - version = "176.git.fc89ae8"; + version = "221.git.ac000cc"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; homepage = https://github.com/ABrandau/OpenRAModSDK; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; - rev = "fc89ae8a10e0f765ac735f923e01aa24dd20e8d2"; - sha256 = "0xyxhipmjlld0kp23fwsdwnspr7fci0mdnjd60gcsh34c7m0341p"; + rev = "ac000cc15377cdf6d3c2b72c737d692aa0ed8bcd"; + sha256 = "16mzs5wcxj9nlpcyx2c87idsqpbm40lx0rznsccclnlb3hiwqas9"; }; engine = { - version = "SP-Bleed-Branch"; + version = "SP-22-04-19"; mods = [ "as" "ts" ]; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRA" ; - rev = "d3545c0b751aea2105748eddaab5919313e35314"; - sha256 = "1jsldl6vnf3r9dzppdm4z7kqbrzkidda5k74wc809i8c4jjnq9rq"; + rev = "bb0930008a57c07f3002421023f6b446e3e3af69"; + sha256 = "1jvgpbf56hd02ikhklv49br4d1jiv5hphc5kl79qnjlaacnj222x"; name = "engine"; inherit extraPostFetch; }; @@ -315,23 +315,23 @@ in { }; yr = unsafeBuildOpenRAMod rec { - version = "118.git.c26bf14"; + version = "199.git.5b8b952"; homepage = https://github.com/cookgreen/yr; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { owner = "cookgreen"; repo = "yr"; - rev = "c26bf14155d040edf33c6c5eb3677517d07b39f8"; - sha256 = "15k6gv4rx3490n0cs9q7ah7q31z89v0pddsw6nqv0fhcahhvq1bc"; + rev = "5b8b952dbe21f194a6d00485f20e215ce8362712"; + sha256 = "0hxzrqnz5d7qj1jjr20imiyih62x1cnmndf75nnil4c4sj82f9a6"; }; engine = rec { - version = "release-20180923"; + version = "release-20190314"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; rev = version; - sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; inherit extraPostFetch; }; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 598ddc485630b..0082b97eb22d3 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -28,6 +28,9 @@ let iana-etc # Steam Play / Proton python3 + # Steam VR + procps + usbutils ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus ++ extraPkgs pkgs; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix new file mode 100644 index 0000000000000..f8c29bfb88fa7 --- /dev/null +++ b/pkgs/games/tdm/default.nix @@ -0,0 +1,102 @@ +{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa_noglu +, xorg, libGLU_combined, openal +, lib, makeWrapper, makeDesktopItem }: + +let + pname = "tdm"; + version = "2.07"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "The Dark Mod - stealth FPS inspired by the Thief series"; + type = "Application"; + categories = "Game;"; + genericName = pname; + }; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + src = fetchurl { + url = "http://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; + sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; + }; + nativeBuildInputs = [ + p7zip scons gnum4 makeWrapper + ]; + buildInputs = [ + glibc_multi mesa_noglu.dev xorg.libX11.dev openal + xorg.libXext.dev xorg.libXxf86vm.dev + libGLU_combined + ]; + unpackPhase = '' + 7z x $src + ''; + + # I'm pretty sure there's a better way to build 2 targets than a random hook + preBuild = '' + pushd tdm_update + scons BUILD=release TARGET_ARCH=x64 + install -Dm755 tdm_update.linux $out/share/libexec/tdm_update.linux + popd + ''; + + # why oh why can it find ld but not strip? + postPatch = '' + sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop --subst-var out + install -Dm755 thedarkmod.x64 $out/share/libexec/tdm + + # The package doesn't install assets, these get installed by running tdm_update.linux + # Provide a script that runs tdm_update.linux on first launch + install -Dm755 <(cat <<'EOF' +#!/bin/sh +set -e +DIR="$HOME/.local/share/tdm" +mkdir -p "$DIR" +cd "$DIR" +exec "PKGDIR/share/libexec/tdm_update.linux" --noselfupdate +EOF + ) $out/bin/tdm_update + + install -Dm755 <(cat <<'EOF' +#!/bin/sh +set -e +DIR="$HOME/.local/share/tdm" +if [ ! -d "$DIR" ]; then + echo "Please run tdm_update to (re)download game data" +else + cd "$DIR" + exec "PKGDIR/share/libexec/tdm" +fi +EOF + ) $out/bin/tdm + sed -i "s!PKGDIR!$out!g" $out/bin/tdm_update + sed -i "s!PKGDIR!$out!g" $out/bin/tdm + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGLU_combined ]} + ''; + + enableParallelBuilding = true; + sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; + NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"]; + meta = with stdenv.lib; { + description = "The Dark Mod - stealth FPS inspired by the Thief series"; + homepage = "http://www.thedarkmod.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ cf6b88f ]; + platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test. + }; +} diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix new file mode 100644 index 0000000000000..119cd8f087694 --- /dev/null +++ b/pkgs/games/xbill/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, libX11, libXpm, libXt, motif, ... }: + +stdenv.mkDerivation rec { + pname = "xbill"; + version = "2.1"; + + buildInputs = [ libX11 libXpm libXt motif ]; + + NIX_CFLAGS_LINK = [ "-lXpm" ]; + + configureFlags = [ + "--with-x" + "--enable-motif" + ]; + + src = fetchurl { + url = "http://www.xbill.org/download/${pname}-${version}.tar.gz"; + sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; + }; + + meta = with stdenv; { + description = "Protect a computer network from getting infected."; + homepage = "http://www.xbill.org/"; + license = lib.licenses.gpl1; + maintainers = with lib.maintainers; [ aw ]; + longDescription = '' + Ever get the feeling that nothing is going right? You're a sysadmin, + and someone's trying to destroy your computers. The little people + running around the screen are trying to infect your computers with + Wingdows [TM], a virus cleverly designed to resemble a popular + operating system. + ''; + }; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 40e6f907bf054..8b05975c16763 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.22.5"; + version = "1.23.0"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "19h7yy92wjfs401jzwyr03f3lp2xwg7sw83728r302rg2ni57m1h"; + sha256 = "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 2b9d048f77e64..4c3a2b2d588ff 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -7,7 +7,7 @@ with import ./util.nix { inherit lib; }; -stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { +stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { inherit name src configureFlags; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 97121e2d6cef9..b2b861c100f9a 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-05-09"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "f444abdfe66696505cb891889b18c4144d12d4ea"; - sha256 = "1id66swgzkgal2hxppm3ls0asffvmsbz81sl1qvci053jr9mr5d0"; + rev = "bb08b81bf719d4c55669c583c65fbe4bbd795501"; + sha256 = "0c5i1c3dn1apj5h1b7iwnphqjpz9fjh7pi87a4rszhfhqdgwyl0a"; }; }; @@ -235,6 +235,17 @@ let }; }; + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2019-05-23"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "86f938db42dd071257a16c6f500c7d7a8dd8f34d"; + sha256 = "0p2w7brlvhsxcvq199a4x59w6zmm3m4mhnr52rm660dydrbvd8gl"; + }; + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; @@ -248,12 +259,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-03-31"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "792d6079d32f1973c142c6fab89d2fdc94019ac8"; - sha256 = "0bi2bmx0k6fwi1jwajgafbb750ajlzz1jncvvg0cssv6h5syxvpk"; + rev = "57e112c12c99185e062a4330896cfaf422d1ea64"; + sha256 = "19ajaxga54kij9ii68cd38frq4y7lr7896wqa5xgs5qq83wh1b1z"; fetchSubmodules = true; }; }; @@ -403,12 +414,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-05-01"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f16b581357a575f37f4c51f6c809e8f2fd98b5bf"; - sha256 = "17fsngxpfy1m0r76c99xphwlcip85s4fyf9zj3vcdvb69hdgva2s"; + rev = "67475c70b4c48b99a0b327a3ff93ca8d25aa3632"; + sha256 = "0bgz2ljfpccawklzhhxvg5z77h4569p6ihf64rqs2q0b3laswmcx"; }; }; @@ -460,12 +471,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-03-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "f89669d2b089d75f1eccbf8d14277b74857a850d"; - sha256 = "0v0jisqzxb3f77xsqcy5i0s4ik0g66bjfh110111lpynki7lcdyc"; + rev = "55471c298412ea3017b0189fd96c032a780963e1"; + sha256 = "1s85a6inp4j1k2llg8vgdiwb4n1rk9hdahrczl32fwxi95c0fv41"; fetchSubmodules = true; }; }; @@ -505,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-04-15"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "9d4e88f6cce63ed1b52ca2401d809c55ab443b25"; - sha256 = "165vxlr2zjh0p7mcqaj60axpnffcrjfx6rvp786nxch4kmfhrz5p"; + rev = "94b33d6a5f9e6bae8ac2abc0bddc89b5ddf02b02"; + sha256 = "0143gz63vas2a4rjxlg0g0pssqvdkipi24las9ap2bhvwhqjh3y7"; }; }; @@ -549,12 +560,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2018-11-15"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3"; - sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza"; + rev = "37bedf88cabb61d4580295b6e347058df7e7f1b4"; + sha256 = "120fi53qp915qnhaqil15b4n22mp4gp5jvi9yirfmsk88hgz2lab"; fetchSubmodules = true; }; }; @@ -572,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-04-15"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "ae7d31f29080ad18073dda3530582dacb18475e6"; - sha256 = "0ip4qrbbamdw9rmzh3w29bw9gx8gqlnxgyrdj4z9a1cpxp0cd5k3"; + rev = "0414b53a23c1da180370bf1228b8553fc5022e3f"; + sha256 = "0hhkzdhrszifbylv9kc23ygg82pvp0m0lyk9lagv305wy7p3dff2"; fetchSubmodules = true; }; }; @@ -695,12 +706,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-04-29"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ac4e7bfb36c88d27799c080218cea3bb833bdbd9"; - sha256 = "10m6v1jrry4fhrbkgb8kkdjasl0pz2qgr9khxl94nlg42fxb1r20"; + rev = "5c87ab86c0e7b0ec8a5edd39a4ce5500bb9e9333"; + sha256 = "0ippj4xpxx8yypfp4fa66hahz9ciy2inyq9275ajpgs7gxs6yx7n"; }; }; @@ -916,12 +927,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-04-19"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "386371f4b35d68c7ec55c09c78cf687ddfafd69b"; - sha256 = "0b3hrqlw7nvcv1w9ir0fsda6crx0a68012a6pii8awdgaw086hzi"; + rev = "6468c3d4f9ee9c32c9e84c5a8743bff8cb429f45"; + sha256 = "18qn0xdxf2ax9qnzib5gbpws1h0gmwfmwalhpismkbwnm8cswipk"; }; }; @@ -949,12 +960,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-05-02"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "78b1cc9e715f509a7e9f157e0d7a0e02b7e5125e"; - sha256 = "0j2i09shwi8fcqfh7m48m4d6bi5pzfgn8mf6iw53v4ah2cdp2m93"; + rev = "bb0b4013611e11200d2ae5a65e8804bbd930a770"; + sha256 = "1sjsrih8cl8pksb3ikycarszhx8cvkgvj4nn63db59fnvdr7nqyl"; }; }; @@ -1037,12 +1048,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-05-09"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "485520af57aee528a3448d1f26bb7761dd915b0e"; - sha256 = "1qq5mydg99y2865gx3i3kzk0vl6agx26l8if4nq47wlxnfcbgslv"; + rev = "10f7d917c5fbc99c0029cf4aa6befb91e4b90364"; + sha256 = "0hap4plkqs21908h1l1y54i77da9nh26ii636ymw8948d7gyb0wc"; }; }; @@ -1147,34 +1158,34 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-03"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7fe72c5d84765e0af19718a57e24659f81471393"; - sha256 = "1kpb6ycsnf0sncpixf3016i2aq82wxvm9q9hjcg9bb7d9706s15d"; + rev = "9fea982b33627eefbfdf2836458b224bd1c724e4"; + sha256 = "1j9q2h41dpkn9g0j88s0daq0iy7c27xxz0cm5lw5ngpd2y6hnl40"; }; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-04-17"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "9baaab193f461193e737dd1342a43d43a380bca6"; - sha256 = "0gh2sdz32hp7wa5rvnrgwp8ga75sxpb4d3fxszkf8vd3gdxkxsq4"; + rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; + sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; }; }; neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-09"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "9575d0f72b82c453281eac697630d85cb097550f"; - sha256 = "12mbgglszgqrbpwwfxhmiq77h6ml4hd0z4ambrdzzl8hidp73d55"; + rev = "8a75afa95ae3a49a690afd72fe86c984c06a672c"; + sha256 = "1g3dyvvkhc6h4l0y8s8pswlrzsbcwdjvyfx4fiwzbqgfccjbnaj9"; }; }; @@ -1332,14 +1343,25 @@ let }; }; + nvim-hs-vim = buildVimPluginFrom2Nix { + pname = "nvim-hs-vim"; + version = "2019-04-14"; + src = fetchFromGitHub { + owner = "neovimhaskell"; + repo = "nvim-hs.vim"; + rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; + sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + }; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2018-12-23"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0"; - sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v"; + rev = "8fcb1af27772174df5446d49de29052cac47e46f"; + sha256 = "0ya3xgbnpps6s67rxfwpcfv39micl1d2wblzb7xvs1pmsymwbj0r"; }; }; @@ -1587,12 +1609,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-04-09"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "9984b9753606fe2c8d7f3d4f9d67c1777a967cd6"; - sha256 = "03vn9rxcsrxnr6y0a6nh5ajl804ha98klk1sms61hlkspxib9il9"; + rev = "53f40ec6c628099e353f25cabd54e5047c28d81d"; + sha256 = "162aa8l4wkssxdw5k3nvbzmqacjkdiy882hhi6mr5596a8wg58js"; }; }; @@ -1708,12 +1730,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-05"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "29e15407b2b372bf1bad95bf0c5264dc7fdc1882"; - sha256 = "1vnxm49zjsk0w7n9arpl9pgy5lh7hrqa2392yl68rhk0vvh5fn46"; + rev = "1e8bae3d13e62628ec2262fcc2dc8aa36d6953fe"; + sha256 = "1bbvbvj8yr83kk6rpai24mhdb2q18yq0rnjj2kxfvzm3cwchbdwz"; }; }; @@ -1774,12 +1796,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-04-24"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "53a5adc5e23b2dcc6a11397fd47b75ff8e0b664a"; - sha256 = "142gac4appj7iswwxaflimjxxb0sdpkqhcinrv7nnxnwdmpnhzak"; + rev = "a79447f261e4b8b4327557aa03726f3849334b84"; + sha256 = "0x6a9rmv220kncjgak6aw3gbf3sidnj6nijphnsm5360lvi3ck4w"; }; }; @@ -1829,12 +1851,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-04-27"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "971d0f6c293002bea7c90773c8fd67f4345ddf7c"; - sha256 = "0aj5x96g4ngir73h79brmijw5gikz6vgbblpbd3np64nb3h86a7c"; + rev = "d07bb40a3064ff5a2fb16c90946a6259ceb447a3"; + sha256 = "18b9215ifp591hkirs9h09g7r7baal2kcxccpz0siq9939y32b9p"; }; }; @@ -1939,12 +1961,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-04-30"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b68c4fdbd32b7ccf3b4e52e69106021f9bc54878"; - sha256 = "0xikbqljpn3br0pbf8iigp3lc0qwxl4gcj6zg4y5gr8aywll7819"; + rev = "bfbc3cadbd142e74d3b92e63f1de8711261015a4"; + sha256 = "1dsxgjia5lb5i3zyagf1gqqk6vil5lj918ihiddik4a96s9vz1s8"; }; }; @@ -2170,12 +2192,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-08"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9a1acf144fd63cae6f48a3b445958d737c0b167e"; - sha256 = "14n3fcmiv733si64226vm72f7gicffrkcq3xadpzzy0n22dnb1hz"; + rev = "193e3504408118687a4063d19d6245cc676281c8"; + sha256 = "0lr47syf1b5xc5y8vw2idm3i3za4scibk7r4cbbbiivikf1v2sgv"; }; }; @@ -2390,12 +2412,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-05-03"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "10eae530889331457b738b28eafcfa3789481fcd"; - sha256 = "0y9m2jnzz58y5h7r8xgfimha8fz0if2pc760g4qbm922afm3a00a"; + rev = "8a84356d5319cad3da2835bd5fbc6318500f31ce"; + sha256 = "1yad8jrcna82ll893wf53ms2hqmcaa63g43yafxvlgmxw5yrh3im"; }; }; @@ -2434,12 +2456,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-03-05"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "2257a283fc6e03d018ff503382c2ae97e32d5afa"; - sha256 = "0fqshk92dn62lz44csavpl9jg5bpd8jfik20ci9plns8nd9g6pg4"; + rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; + sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; }; }; @@ -2456,12 +2478,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-03-26"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5"; - sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k"; + rev = "d8bf968958f4bdc838321cceace52299f28ad750"; + sha256 = "0y1wwscj5vn9ssmysr12zwx1k1a4j6l0gchhlrvgzj4ar2wpvig0"; }; }; @@ -2533,12 +2555,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-05-02"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "98c03047d15dfa62cedf56e27bffb03772d41753"; - sha256 = "0pbad3hlsy6glhmbz6nkb6lfx9y3yb6rw23vc48acxw936zm282n"; + rev = "38e8bbfd0019033ae53d623e3fd1d9cf6ec2d335"; + sha256 = "1mbgks1460vm8sl2hkag6hrsvbf9gfvdlswqr5hh8hy3laylh6qf"; }; }; @@ -2577,12 +2599,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-09"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f327d6e523975e1544b2effd426b99df25b01d18"; - sha256 = "0abh80w4xyg1wpc1fra9m68f882x430ky0vjfbp9xsnz3i5xd44c"; + rev = "d390b89ef151caf66c8a56a4ecdbdf7c38655727"; + sha256 = "030s4ax4lbw04d2xzklyx9m33sjbkql9nj0djgz14i7h2kq1yw6v"; }; }; @@ -2632,12 +2654,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-05-04"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d99841b22928f1597d447c68de844989bf9a804"; - sha256 = "1af7hz2jqkh4lbfkvpyb1hfgxlfk2f2z9idp5f0f8zz8mmbdf6yr"; + rev = "0f9db6af704f6fcf5cd06de964deb8223e47db4c"; + sha256 = "1brg6m84zlhb4s8gmjpqa204g4ym5qg6rir9s163wfynkr0prw19"; }; }; @@ -2676,12 +2698,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-03-11"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "7eeea63e62b1cc088a75c7a7c244fc774d82e5bb"; - sha256 = "0m7mkhm5cq4aknaxxn476lykkgyapb350cn20ax5c9nrmpfzf4rz"; + rev = "e5936a22cfd2e25893e2ac34af4b0afdec1e36f5"; + sha256 = "04nhkg1axpcvzjba6rvjn16v3gfdch12y74mfcrbmj0v2qqs8rgk"; }; }; @@ -2698,12 +2720,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-07"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "c4b419db6c57125e91d6f292daa664b73b155b7b"; - sha256 = "1whcmgr0isa7np6xmc66jrc68an58677bnpzyrd1y817np5f2336"; + rev = "79ea9ef26807eda0b55809d0521993bcecfa09e5"; + sha256 = "06aid6k8128zx0dbp52whwii9xjy8m5lwrvn4l30in29mbl0nrqk"; }; }; @@ -3049,6 +3071,17 @@ let }; }; + vim-lion = buildVimPluginFrom2Nix { + pname = "vim-lion"; + version = "2018-02-05"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-lion"; + rev = "75306ac1922952ca1a401aee43ddbb304029926d"; + sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; + }; + }; + vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; version = "2016-02-11"; @@ -3062,12 +3095,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2019-03-24"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "08f1389285902473a8b2de045c2d916fcc5affbc"; - sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1"; + rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9"; + sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3"; }; }; @@ -3084,12 +3117,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-04-24"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9616bcb14c0128a6722806dafe2b6f325fa0c26f"; - sha256 = "10vsmcifjinqd26rw4fk94l4pymqzsqm66d8gwdqpp3jkx5birwg"; + rev = "1fb7e1a50a11f5c45988c6515141b83e131d674f"; + sha256 = "065yfp499640kkdn3n1n246lq3dhvgpc9ibpzn77qvqpmjavanzh"; }; }; @@ -3172,12 +3205,12 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2018-08-27"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; - sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; + rev = "1403934ebe9f2e1951ebafa38dd93ca9326c890e"; + sha256 = "0910slyddcgl03ijayx2p2vhvsz4442q7ffsz7xsrl6fr0k0xkj9"; }; }; @@ -3260,12 +3293,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-05-05"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2e342ac8b841934c66a1c9afade42e709a068095"; - sha256 = "1hzjp9s490k8rcvv74zhjn8k17xn9igxbzxxkxy3n3zxhfd3jw8j"; + rev = "11e86deecb715fe1b9ca04d9b313f9432013b2b1"; + sha256 = "171xkz7wvrb7c6c12sgf3v2clmbdand23wvi5rm6g8lf1x11kvsq"; }; }; @@ -3282,12 +3315,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-05-05"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "e557ade9aceb4925cd919c412fe9660b8c4f4cba"; - sha256 = "1msryzjzlv4mil05h17jjy09839dzqp9r11g1f369zxi5hini8g2"; + rev = "14c778e5bf069a1f13a4645aa8a34e1b46c980a8"; + sha256 = "1a66f0shycqkl1329lgbvrbbzwdv8pgi9d8zaybw9jddn64rx9r7"; }; }; @@ -3601,12 +3634,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2018-08-29"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "91192d8969af1d86c98beff4001612976ea25d7a"; - sha256 = "0nmbrp0ma9s3yfzb8z70l0pcxv8p115zv6fz4injxn1c436x9337"; + rev = "045b3c0a70815de8e928a094c36d3b6bfde0aade"; + sha256 = "1qwhfbsjwz58wph91l4disk1ab1c63lirf9j472wlwb22nf4yzlc"; }; }; @@ -3623,12 +3656,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-05-01"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9827f1713407ace7d7608b5dec4db256979d5858"; - sha256 = "1l3pig6v0k629av50vcdhc0qwh5v1lsg7wlmm77q11sk0jacw2sv"; + rev = "7ade68cb23b33e9483667a09dc6683bb5b4de682"; + sha256 = "0ix30glpl55xz9knpi9p7gmyjpjg2nr4yg94qa8wj9y8hs54zm5l"; }; }; @@ -3667,12 +3700,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-04-11"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "0a212847827933436d0b139f37b9825e28e3c0a1"; - sha256 = "08si59jvwlgj1i8z1i0ly439ar75ifrnlraa6nw20n3ii6nwzsvh"; + rev = "2e5d068572f1e6899d7cb7b509020b0a6f0c3f68"; + sha256 = "1hkf8lc63bdjwdcp0cabwx3p1jydiy4h5gzm042110szxx5xir3q"; }; }; @@ -3755,23 +3788,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-03-31"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a44bf0b1a142bb39e84e5d525f7d98b5d3a66057"; - sha256 = "12wyjfmwz3lsd45vv4ava361ph6gravggi9vvvr9qgf5zc1shd3b"; + rev = "ebe0344bb7a446f7ae654caa057a07b90dfbd03f"; + sha256 = "0d5a57l7yl1l272adajnqy3frqrnbhlw810klay7dwkqk4s7psvl"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-05-09"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "8e137f223df427e620496f02f0fda6363a76435f"; - sha256 = "0qj4f597mr20lglvyapviqzn390yiwbaksb2bz42v4s0zh33nahg"; + rev = "f665955382b4baf4f2e33344250a9914c5281681"; + sha256 = "0mx4gz072gx7kvrhmfn7kdh3ccx9q1hfibkwz6870a3hxsciin6a"; }; }; @@ -3854,23 +3887,23 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-04-20"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "e48cc1d71b838e6223a0ece54b9457ed76f92676"; - sha256 = "16cx1j76b9kdrcjs8hhl15kfhpgan69qs9djda0c1pvzphj4bbgp"; + rev = "09ac84c4d152a944caa341e913220087211c72ef"; + sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; }; }; vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-04-27"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "7fa183675d690054022e5d27dbfc29e740637641"; - sha256 = "14hl9v5l08qcsj3a9zd53v72lr7hm4vkyv8idmxg9wi0m0bqgq5i"; + rev = "88a3c999d44baa0c6a8b9711843159c25e75e950"; + sha256 = "049m0plpvay4sqx9mqkln80bm6g89ydy32hpfpnbbdd0r4ifp1kr"; }; }; @@ -4019,12 +4052,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-03"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ee10671c2b25287196194426607c2684827126f7"; - sha256 = "04mxx4ww1qmr6918dryfh956lwmyz4nlq4dissms440p4kqf5giv"; + rev = "596a0fdbf44b6262867492b2f3f76c5e0cadc2e0"; + sha256 = "0ndrc1svm7z3zhkrndjsv17pimms2arb8pagsgavf7cjixn9n6ji"; }; }; @@ -4074,12 +4107,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-05-08"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "81652d1384a8491fd0dea53f466d95fef7c9f46e"; - sha256 = "029nvdwn04hq46nh7q94fazsxf17vhjk07mxhbhdxx1syfw0fslg"; + rev = "c5c412fae2f72a07dff24ba8652c6d5e13924167"; + sha256 = "08rx1xb0mn6krfj3q8vrzlvzzh2dljjddn3wbkjvamihblnjbf7v"; }; }; @@ -4163,12 +4196,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-05-08"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "f7e0a6cb7580471d1fc1c68ab85467ff207b5dee"; - sha256 = "0cbv9ahnl70zh3abrr43ijyaqxnprp1kp6bgiwkpi7qzvcbvwzca"; + rev = "dbcc3b0e14876fd4f39d38dfdef22351f74da3a5"; + sha256 = "17rmmdnmj4pa1admls3d3w43vl9r040x3yhf4nnr1pf2jarv028v"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 68ec903e613e3..e48d427d41000 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,6 +1,6 @@ { lib, stdenv , python, cmake, meson, vim, ruby -, which, fetchgit, fetchurl +, which, fetchgit, fetchurl, fetchzip , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses @@ -43,15 +43,16 @@ self: super: { }; LanguageClient-neovim = let + version = "0.1.146"; LanguageClient-neovim-src = fetchurl { - url = "https://github.com/autozimu/LanguageClient-neovim/archive/0.1.140.tar.gz"; - sha256 = "0cixwm9wnn6vlam6mp57j436n92c4bvj5rs6j2qcv7qip8d2ggyw"; + url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; + sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0f591zv4f7spks2hx22nkq78sj42259gi7flnnpr1nfs40d7n13n"; + cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -62,7 +63,7 @@ self: super: { }; in buildVimPluginFrom2Nix { pname = "LanguageClient-neovim"; - version = "0.1.140"; + inherit version; src = LanguageClient-neovim-src; propagatedBuildInputs = [ LanguageClient-neovim-bin ]; @@ -108,6 +109,22 @@ self: super: { ''; }); + + coc-nvim = let + version = "0.0.67"; + index_js = fetchzip { + url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; + sha256 = "0cqgrfyaq9nck1y6mb63gmwgdrxqzgdgns5gjshpp1xzfq6asrqj"; + }; + in super.coc-nvim.overrideAttrs(old: { + # you still need to enable the node js provider in your nvim config + postInstall = '' + mkdir -p $out/share/vim-plugins/coc-nvim/build + cp ${index_js}/index.js $out/share/vim-plugins/coc-nvim/build/ + ''; + + }); + command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6324064c18fae..bb74107cbd1b1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -215,7 +215,9 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +neoclide/coc.nvim neoclide/vim-easygit +neovimhaskell/nvim-hs.vim neovimhaskell/haskell-vim neovim/nvimdev.nvim neutaaaaan/iosvkem @@ -305,6 +307,7 @@ thinca/vim-themis thinca/vim-visualstar tomasr/molokai tomlion/vim-solidity +tommcdo/vim-lion tomtom/tlib_vim tpope/vim-abolish tpope/vim-commentary diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 89ed98cd0a79d..37e5759c85840 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.23.0"; - sha256 = "1c7qia60fgak5pisl1qzp2kvm1cs30b29rxpydk7j3lqcpqr5ixj"; + version = "0.23.1"; + sha256 = "08kfzvyl8vgjmhqzpp7pxw0gd87jr5g7z15ag4cpcil4inq4c8k3"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1c4c59f4ecb18..fb7e163dbe7f6 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ rec { }; }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "auto-close-tag"; + publisher = "formulahendry"; + version = "0.5.6"; + sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 034866d5b2fae..6d8e59ba095ce 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.0"; - sha256 = "0a23l8vaj0yghfh9lbi453vjghaxgjmphfjy2s4lgrvq38j4bv9n"; + version = "2.1.1"; + sha256 = "14qy073dfw0b4mk76l17il65r44jrz7pn1hvlj84562qp48b8skz"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 90319efd7c78a..2956b107aa71a 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; + sha256 = "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"; }; # ToDo: a52, etc.? @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; - configureFlags = [ - "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d" - ]; - meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 2ced9c6094eca..09c430bcd53bc 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"; + sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 832167b6f26a2..aa08160871e08 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, protobuf, protobufc, asciidoc +{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig -, python }: +, which, python, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "3.9"; + version = "3.11"; src = fetchurl { url = "https://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx"; + sha256 = "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; + nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ]; postPatch = '' substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" @@ -23,17 +23,22 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - buildPhase = "make PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; - makeFlags = "PREFIX=$(out)"; + outputs = [ "out" "dev" "man" ]; + + preBuild = '' + # No idea why but configure scripts break otherwise. + export SHELL="" + ''; hardeningDisable = [ "stackprotector" "fortify" ]; # dropping fortify here as well as package uses it by default: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] - installPhase = '' - mkdir -p $out/etc/logrotate.d - make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto + postFixup = '' + wrapProgram $out/bin/criu \ + --prefix PATH : ${lib.makeBinPath [ iptables ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 566d1e9f56a77..7f31ac1dac07d 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.03.00"; + version = "19.05.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1zri73qmpgc0dwmdcfbcywcvxld7dqz7rkwwqncfkvvfc9zchk5l"; + sha256 = "0hhwp25a7lknzmbbm067nxlzgyb3p7gh119jra2gdkm6d3p2gc47"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 8ae5785eea8b2..fc308285dd6de 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "google-authenticator-libpam-${version}"; - version = "1.05"; + version = "1.06"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946"; + sha256 = "01kb1ppsc2fz1i3crdwi6ic8gyphjv89f5li6ypv3pp88v3kxw2j"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b1b5401b88db8..73174779c8c6d 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; + sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index dcd5b4763ff15..76ec9be279853 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -2,14 +2,14 @@ , glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { - name = "iio-sensor-proxy-${version}"; - version = "2.5"; + pname = "iio-sensor-proxy"; + version = "2.7"; src = fetchFromGitHub { owner = "hadess"; - repo = "iio-sensor-proxy"; + repo = pname; rev = version; - sha256 = "06x1vvslsa44bgw8s5rr17q9i2ssbw0x04l75zsy3rql9r3y2jzg"; + sha256 = "05ipljw78d8z90cnkygcrpd0qq4vh14bb9hy06vqxnpdbyq46fxh"; }; configurePhase = '' diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 223d5c4fe0fbb..57eb09e40cfc5 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - time = "20190324"; + time = "20190515"; # ninfod probably could build on cross, but the Makefile doesn't pass --host # etc to the sub configure... withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; @@ -21,19 +21,19 @@ in stdenv.mkDerivation { owner = "iputils"; repo = "iputils"; rev = "s${time}"; - sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; + sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i"; }; # ninfod cannot be build with nettle yet: patches = [ ./build-ninfod-with-openssl.patch - (fetchpatch { # tracepath: fix musl build, again - url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; - sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; + (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc + url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch"; + sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw"; }) - (fetchpatch { # doc: Use namespace correctly - url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; - sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; + (fetchpatch { # build-sys: Make setcap really optional + url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch"; + sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf"; }) ]; @@ -41,13 +41,14 @@ in stdenv.mkDerivation { [ "-DUSE_CRYPTO=nettle" "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" + "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" ] ++ optional (!withNinfod) "-DBUILD_NINFOD=false" # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap nettle systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional withNinfod openssl; # TODO: Build with nettle diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index ea4e041d43a00..cc3e039d2414f 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -4,13 +4,10 @@ }: let - common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation { - name = "linux-headers-${version}"; + makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { + inherit src; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - inherit sha256; - }; + name = "linux-headers-${version}"; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; @@ -73,13 +70,18 @@ let }; }; in { + inherit makeLinuxHeaders; - linuxHeaders = common { - version = "4.19.16"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; - patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above - ]; - }; + linuxHeaders = let version = "4.19.16"; in + makeLinuxHeaders { + inherit version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + }; + patches = [ + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above + ]; + }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c10b2b8a6d4ad..ef6c3d1da8b0e 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.120"; + version = "4.14.121"; # 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 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x"; + sha256 = "1118vcfw2p29h85rzs5cpfax3w79fv6x8v38vnvci609ba1ddv1f"; }; } // (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 bd5f2fe347d14..5cf19ed57c4f0 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.44"; + version = "4.19.45"; # 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 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh"; + sha256 = "0awx9d8i73naz5b27vzjpv5l4vblr65dvv1ci7dyxaihpcpyccgb"; }; } // (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 ca30427a8833f..ea88cba5b89db 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.177"; + version = "4.9.178"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7"; + sha256 = "0ri50wiwqxnrl26b48czqvblkc20ys779x17x7wyk72xfaqdizqk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 28ea81e8795bb..c0d407cd8f706 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.17"; + version = "5.0.18"; # 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 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb"; + sha256 = "1n5hdn9wkdx0483lc86h3ys14p1309n00gqy7w0qm8m7j0yhpgbz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 5db24b34ec9d9..b8e29ed54afa4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.3"; + version = "5.1.4"; # 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 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh"; + sha256 = "1yg7s6mcfi4kvlf0ykfj5j54flwdx0xjzjygnhx2nralpbx6avaw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 3fcb2fcbb24a9..df741d9a029bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.102-156"; + version = "4.14.120-160"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.102"; + modDirVersion = "4.14.120"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "12af0n1lg2w2qm9aq1v8w3x8npaka60ks9xp6jwaw0l06j23ryyv"; + sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 144ac0e07cbca..3718a8f636a25 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,26 +1,17 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.0.2019.04.04"; + version = "5.0.2019.05.08"; modDirVersion = "5.0.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "d83b992f653d9f742f3f8567dbcfd1f4f72e858f"; - sha256 = "17xipjhkl4arshyj3riwq4pgl2qqcnlfhaga77a430wy22s7plh2"; + rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7"; + sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls"; }; extraConfig = "BCACHEFS_FS m"; - kernelPatches = [ - { name = "export-bio_iov_iter_get_pages"; - patch = fetchpatch { - name = "export-bio_iov_iter_get_pages.patch"; - url = "https://evilpiepirate.org/git/bcachefs.git/patch/?id=bd8be01aa04eb9cc33fcdce89ac6e0fac0ae0fcf"; - sha256 = "0h5z98krx8077wwhiqp3bwc1h4nwnifxsn8mpxr2lcxnqmky3hz0"; - }; } - ]; - extraMeta = { branch = "master"; hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7888ac6af44c9..e9cc370f4e7bb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.1-rc7"; - modDirVersion = "5.1.0-rc7"; - extraMeta.branch = "5.1"; + version = "5.2-rc1"; + modDirVersion = "5.2.0-rc1"; + extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "05085j84kn3mf5s2hy8i9jgvnglpr9v918kmc9lmpn5vq7frh9s1"; + sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6210523d62a5f..7a663fca6948c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf +, libelf, cpio , utillinux , writeTextFile }: @@ -284,10 +284,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] - ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools + ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] + ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix new file mode 100644 index 0000000000000..a23c0cb092690 --- /dev/null +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, libelf +}: + +with builtins; + +stdenv.mkDerivation rec { + name = "libbpf-${version}"; + version = "0.0.3pre114_${substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "libbpf"; + repo = "libbpf"; + rev = "672ae75b66fd8780a4214fe7b116c427e0809a52"; + sha256 = "1bdw1hc4m95irmybqlwax85b6m856g07p2slcw8b7jw3k4j9x075"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf ]; + + sourceRoot = "source/src"; + enableParallelBuilding = true; + makeFlags = [ "PREFIX=$(out)" ]; + + patchPhase = '' + substituteInPlace ../scripts/check-reallocarray.sh \ + --replace '/bin/rm' 'rm' + ''; + + # FIXME: Multi-output requires some fixes to the way the pkgconfig file is + # constructed (it gets put in $out instead of $dev for some reason, with + # improper paths embedded). Don't enable it for now. + + # outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "Upstream mirror of libbpf"; + homepage = "https://github.com/libbpf/libbpf"; + license = with licenses; [ lgpl21 /* or */ bsd2 ]; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 192e1d61e43e3..02d628fdfbcd1 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "23"; + version = "23.1"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1n0v075ndczwrc87b70vxhx42nv1p953cqycmgnz334790zg002g"; + sha256 = "0blwqfj73bnk7byj2mavvnyh87mwhpzwgzg60s9vv9jnfcnbhlhk"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c6140bd12be03..c2d4d8645a4ec 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -182,9 +182,10 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc5"; + # This is now "stable". Move to zfsStable after it's tested more. + version = "0.8.0"; - sha256 = "1944w36rk33mn44zfvc1qbn2sv9h90r25zxnanwvyhss0vgqw73v"; + sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; isUnstable = true; extraPatches = [ diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index ca241192156ad..6a64b0bc39933 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.15.2"; + version = "6.15.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "01b7k4i38xjjkfjcphylyxhsff6ckgi4nsz6nlw2ax8a3avrmnfd"; + sha256 = "0br51h8i99v6xc15280ra447c7fkiwf8nqgyzni0llhy1g1qcnmv"; }; buildPhase = '' diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix new file mode 100644 index 0000000000000..0e424d1d12257 --- /dev/null +++ b/pkgs/servers/endlessh/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "endlessh"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = pname; + rev = version; + sha256 = "186d7hf5p8yc46lmbrh0kxyfi1nrrx9n3w0jd9kh46vfwifjazra"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "SSH tarpit that slowly sends an endless banner"; + homepage = "https://github.com/skeeto/endlessh"; + license = licenses.unlicense; + maintainers = [ maintainers.marsam ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index ae693a49027f2..a578b7e0e5380 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -41,9 +41,10 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBRESSL_USE_STATIC_LIBS=FALSE" + (lib.optionalString officialRelease "FDB_RELEASE=1") - # CMake can't find these easily for some reason? + # FIXME: why can't libressl be found automatically? + "-DLIBRESSL_USE_STATIC_LIBS=FALSE" "-DLIBRESSL_INCLUDE_DIR=${libressl.dev}" "-DLIBRESSL_CRYPTO_LIBRARY=${libressl.out}/lib/libcrypto.so" "-DLIBRESSL_SSL_LIBRARY=${libressl.out}/lib/libssl.so" @@ -51,8 +52,6 @@ let # LTO brings up overall build time, but results in much smaller # binaries for all users and the cache. - # - # TODO FIXME: bugs :( (lib.optionalString (!useClang) "-DUSE_LTO=ON") # Gold helps alleviate the link time, especially when LTO is @@ -60,10 +59,12 @@ let # Same with LLD when Clang is available. (lib.optionalString useClang "-DUSE_LD=LLD") (lib.optionalString (!useClang) "-DUSE_LD=GOLD") - ] - ++ lib.optional officialRelease [ "FDB_RELEASE=1" ]; + ]; inherit patches; + + # fix up the use of the very weird and custom 'fdb_install' command by just + # replacing it with cmake's ordinary version. postPatch = '' for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do substituteInPlace $x --replace 'fdb_install' 'install' diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 790959f0a0d6f..713cc135d2944 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,10 +69,10 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.6pre4898_${substring 0 7 rev}"; + version = "6.1.7pre4928_${substring 0 7 rev}"; branch = "release-6.1"; - rev = "26fbbbf798971b2b9ecb882a8af766fa36734f53"; - sha256 = "1q1a1j8h0qlh67khcds0dg416myvjbp6gfm6s4sk8d60zfzny7wb"; + rev = "a990458e81612632159bbf75167a36f64ef228d1"; + sha256 = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0"; officialRelease = false; patches = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 12240320979ca..c7f1bb475c1b3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -209,7 +209,7 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ ]; "fints" = ps: with ps; [ fints ]; - "fitbit" = ps: with ps; [ aiohttp-cors ]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; "flexit" = ps: with ps; [ ]; "flic" = ps: with ps; [ ]; @@ -455,8 +455,8 @@ "nello" = ps: with ps; [ ]; "ness_alarm" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; - "netatmo" = ps: with ps; [ aiohttp-cors ]; - "netatmo_public" = ps: with ps; [ aiohttp-cors ]; + "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ]; + "netatmo_public" = ps: with ps; [ aiohttp-cors pyatmo ]; "netdata" = ps: with ps; [ ]; "netgear" = ps: with ps; [ ]; "netgear_lte" = ps: with ps; [ ]; @@ -637,7 +637,7 @@ "somfy_mylink" = ps: with ps; [ ]; "sonarr" = ps: with ps; [ ]; "songpal" = ps: with ps; [ ]; - "sonos" = ps: with ps; [ ]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; "soundtouch" = ps: with ps; [ libsoundtouch ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1fe48e84fac75..6bb4ce46a43b3 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.13.6.2"; + version = "1.15.8.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; + sha256 = "0hh8aygyzxgb0cyafqin70nbi87jpnjvxbf00dljssbpl66278c9"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix deleted file mode 100644 index 6a92c0a228af3..0000000000000 --- a/pkgs/servers/http/winstone/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "winstone-${version}"; - version = "0.9.10"; - - src = fetchurl { - url = "mirror://sourceforge/winstone/${name}.jar"; - sha256 = "17xvq3yk95335c6ag1bmbmxlvh7gqq35ifi64r2l6rnvrf6pqyan"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib - cp $src $out/lib/winstone.jar - ''; - - meta = { - homepage = http://winstone.sourceforge.net/; - description = "A simple Java Servlet container"; - license = stdenv.lib.licenses.cddl; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; -} diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index d41c94eee562e..9be9a1ec06c2a 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.2"; + version = "10.3.3"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz"; + sha256 = "197bmr9y13rxms1bwm4infrv0dzbv9qqw67lb1alskmpp0vjg3s7"; }; buildInputs = [ diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 3afbfbbd224b8..e7bff373c3a81 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: -let - version = "1.3.5.19"; -in + stdenv.mkDerivation rec { - name = "389-ds-base-${version}"; + pname = "389-ds-base"; + version = "1.3.9.1"; src = fetchurl { - url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2"; - sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp kerberos pcre + net_snmp kerberos pcre libevent openssl python ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); - # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump - - patches = [ ./perl-path.patch + patches = [ + (fetchpatch { + name = "389-ds-nss.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9"; + sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk"; + }) ]; + postPatch = '' + substituteInPlace Makefile.am \ + --replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g' + ''; preConfigure = '' # Create perl paths for library imports in perl scripts @@ -43,22 +49,19 @@ stdenv.mkDerivation rec { "--with-netsnmp=${net_snmp}" ]; - preInstall = '' - # The makefile doesn't create this directory for whatever reason - mkdir -p $out/lib/dirsrv - ''; + enableParallelBuilding = true; installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=${placeholder "TMPDIR"}" ]; passthru.version = version; meta = with stdenv.lib; { - homepage = http://www.port389.org/; + homepage = "https://www.port389.org/"; description = "Enterprise-class Open Source LDAP server for Linux"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/servers/ldap/389/perl-path.patch b/pkgs/servers/ldap/389/perl-path.patch deleted file mode 100644 index 73af83a9d6aaf..0000000000000 --- a/pkgs/servers/ldap/389/perl-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" <william@wkennington.com> -Date: Fri, 9 Jan 2015 14:52:11 -0800 -Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files - ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index c97d1e1..763bf3b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS - @BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \ - @BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \ - @BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \ --@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \ -+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \ - @BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \ - @BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \ - @BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \ -@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS - @BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \ - @BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \ - @BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \ --@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \ -+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \ - @BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \ - @BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \ - @BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \ --- -2.1.4 - diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e181b850ea425..cde8ae16a3321 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.3.2"; + version = "0.99.5"; src = fetchPypi { inherit pname version; - sha256 = "0jcmav15ms3859174zpqf11hb7xdql4fgqmxlxpxjllzipq4fwiz"; + sha256 = "0f50nfddrd4zxyv27wn9k5fxhqqa9kgvk2ijby0pgf61b054dhfn"; }; patches = [ diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3ded244b9fbfc..bf57d3f418636 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.6"; + version = "6.2.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "12fj3j1w37nm8p2h4af38wbxkvm0pzf1zsjx8wpj0zrxanbigpjg"; + sha256 = "18zig7r3kq1a3src0yb8fbajnm2hqzpzpmpjarslnp4xv90xqi87"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1dg2gjmym06x8wj2xmygsww622k86cq07kbxvp8j8h17br4imj4k"; + sha256 = "1cy3d04jjr5h8pzfzqb710rlynh9n125imkisrg05dwz5gl99bd7"; }; postPatch = '' diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/pkgs/servers/mxisd/0001-gradle.patch index 55ff6ead22d44..8a9f5a81180bb 100644 --- a/pkgs/servers/mxisd/0001-gradle.patch +++ b/pkgs/servers/mxisd/0001-gradle.patch @@ -1,19 +1,19 @@ ---- a/build.gradle 2018-11-16 15:15:29.021469758 +0100 -+++ b/build.gradle 2018-11-16 15:16:50.982289782 +0100 -@@ -64,7 +64,7 @@ +--- a/build.gradle 2019-05-16 21:09:08.373112953 +0200 ++++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200 +@@ -72,7 +72,7 @@ buildscript { repositories { -- mavenCentral() -+ REPLACE +- jcenter() ++REPLACE } dependencies { -@@ -73,9 +73,7 @@ +@@ -81,9 +81,7 @@ } repositories { -- mavenCentral() +- jcenter() - maven { url "https://kamax.io/maven/releases/" } - maven { url "https://kamax.io/maven/snapshots/" } +REPLACE diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 0d3bc4f3e08b5..9d26ecb6ab16b 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_2_5, perl, makeWrapper, writeText }: +{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_4_10, perl, makeWrapper, writeText }: let name = "mxisd-${version}"; - version = "1.2.0"; - rev = "8c4ddd2e6526c1d2b284ba88cce3c2b926d99c62"; + version = "1.4.3"; + rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16"; src = fetchFromGitHub { inherit rev; owner = "kamax-matrix"; repo = "mxisd"; - sha256 = "083plqg0rxsqwzyskin78wkmylhb7cqz37lpsa1zy56sxpdw1a3l"; + sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69"; }; deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle_2_5 perl git ]; + nativeBuildInputs = [ gradle_4_10 perl git ]; buildPhase = '' export MXISD_BUILD_VERSION=${rev} @@ -35,13 +35,13 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0shshn05nzv23shry1xpcgvqg59gx929n0qngpfjhbq0kp7px68m"; + outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv"; }; in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; buildInputs = [ jre ]; patches = [ ./0001-gradle.patch ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3e3bd8a465325..b62ddbf7b29aa 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.7"; + version = "15.0.8"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0jcxza0p1vc9dhf2mimvyy1j25nzv02srghdsp6108573yamhq9y"; + sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp"; }; installPhase = '' diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 00821e6e40aef..28808a00a7cf6 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "04hxj7nfmbh5wfqkq1p5q2ncxszwm80l218vfdy93aw0p79r4qqf"; + url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; + sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a"; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ]; + maintainers = with maintainers; [ rickynils domenkozar aanderse ]; }; } diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index aaeb810eca0b6..27b4a5123462e 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" + "--sysconfdir=/etc" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix new file mode 100644 index 0000000000000..de3cde8120d69 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: + +if stdenv.lib.versionOlder postgresql.version "10" +then throw "PipelineDB not supported for PostgreSQL ${postgresql.version}" +else +stdenv.mkDerivation rec { + pname = "pipelinedb"; + version = "1.0.0-13"; + + src = fetchFromGitHub { + owner = "pipelinedb"; + repo = pname; + rev = version; + sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; + }; + + buildInputs = [ postgresql openssl zeromq ]; + + makeFlags = [ "USE_PGXS=1" ]; + + preConfigure = '' + substituteInPlace Makefile \ + --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -t $out/lib/ pipelinedb.so + install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control} + ''; + + meta = with stdenv.lib; { + description = "High-performance time-series aggregation for PostgreSQL"; + homepage = https://www.pipelinedb.com/; + license = licenses.asl20; + platforms = postgresql.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index e5f29dc7d57cc..60faa2db2407f 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -31,6 +31,8 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; + pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; + timescaledb = super.callPackage ./ext/timescaledb.nix { }; tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 297a0215aac78..1530480dc4bf3 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.9"; + version = "4.9.11"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; + sha256 = "06kb4h10n5nvmv79fs5nwk40pc4vl4xqidksy9fxasgn6md87p1d"; }; buildInputs = [ openssl ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 9a2e71e5a4011..c6a893da5eb75 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-05-11"; + version = "2019-05-21"; name = "oh-my-zsh-${version}"; - rev = "486fa1010df847bfd8823b4492623afc7c935709"; + rev = "60736c9f37ccf886291a5995dfc6f7215b0d8b56"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "097n64xzdqgqdbgcqnzsk0s9r9yn8ncqbixbsxgpcj29x9hi1dkn"; + sha256 = "1bkv6fh2x0mc0bkv8rkfvj1qpwqai5aj9nxvmmhgyig4n2g853m3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7823d6413442d..a384e5470e483 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -128,7 +128,7 @@ rec { with the following function: isFree = license: with builtins; - if isNull license then true + if license == null then true else if isList license then lib.all isFree license else license != "non-free" && license != "unfree"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 3c3917c827e20..20062bba8ee6f 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -81,7 +81,7 @@ in rec { bintools = { name = "${name}-binutils"; outPath = bootstrapTools; }; }; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + cc = if last == null then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenvNoCC; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2bccd620436a1..390c7f1123ecc 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -96,7 +96,7 @@ let inherit system; }; - cc = if isNull prevStage.gcc-unwrapped + cc = if prevStage.gcc-unwrapped == null then null else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix new file mode 100644 index 0000000000000..4efd86ca63faa --- /dev/null +++ b/pkgs/tools/X11/alttab/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +, xorg }: + +stdenv.mkDerivation rec { + version = "1.4.0"; + + pname = "alttab"; + + src = fetchFromGitHub { + owner = "sagb"; + repo = pname; + rev = "v${version}"; + sha256 = "028ifp54yl3xq5mj2ww9baga8p56nmrx4ypvj8k35akcaxdpyga9"; + }; + + nativeBuildInputs = [ + autoconf + automake + pkgconfig + ronn + ]; + + preConfigure = "./bootstrap.sh"; + + buildInputs = [ + libpng + uthash + xorg.libX11 + xorg.libXft + xorg.libXmu + xorg.libXpm + xorg.libXrandr + xorg.libXrender + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sagb/alttab; + description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.sgraf ]; + }; +} diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 5baba11715713..51f2f5ec2494b 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, gobject-introspection, gtk3, xrandr, python3Packages }: +{ stdenv, fetchurl, python3Packages +, gobject-introspection, gsettings-desktop-schemas, gtk3 +, wrapGAppsHook, xrandr +}: let inherit (python3Packages) buildPythonApplication docutils pygobject3; @@ -17,13 +20,13 @@ in buildPythonApplication rec { # no tests doCheck = false; - buildInputs = [ docutils ]; - nativeBuildInputs = [ gobject-introspection gtk3 ]; - propagatedBuildInputs = [ xrandr pygobject3 ]; + # hook for gobject-introspection doesn't like strictDeps + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; - makeWrapperArgs = [ - "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" - ]; + buildInputs = [ docutils gsettings-desktop-schemas gtk3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { homepage = http://christian.amsuess.com/tools/arandr/; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index c6135e8d143fe..d0731c1f5996e 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -1,38 +1,38 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - - name = "analog-6.0.13"; - - buildInputs = [ unzip ]; - - src = fetchurl { - url = "http://www.c-amie.co.uk/static/analog/6013/analog-src-6013ce.zip"; - sha256 = "1njfsclmxk8sn1i07k3qfk8fmsnz7qw9kmydk3bil7qjf4ngmzc6"; + pname = "analog"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "c-amie"; + repo = "analog-ce"; + rev = version; + sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; }; configurePhase = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${name}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" ''; installPhase = '' - mkdir -p $out/bin $out/etc $out/share/doc/${name} $out/share/man/man1 $out/share/${name} + mkdir -p $out/bin $out/etc $out/share/doc/$pname $out/share/man/man1 $out/share/$pname mv analog $out/bin/ cp examples/big.cfg $out/etc/analog.cfg mv analog.man $out/share/man/man1/analog.1 - mv docs $out/share/doc/${name}/manual - mv how-to $out/share/doc/${name}/ - mv lang images examples $out/share/${name}/ + mv docs $out/share/doc/$pname/manual + mv how-to $out/share/doc/$pname/ + mv lang images examples $out/share/$pname/ ''; meta = { - homepage = https://www.c-amie.co.uk/software/analog/; - license = stdenv.lib.licenses.gpl2; + homepage = "https://www.c-amie.co.uk/software/analog/"; + license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix new file mode 100644 index 0000000000000..f53ef4a16fa6a --- /dev/null +++ b/pkgs/tools/admin/certigo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "certigo"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "square"; + repo = pname; + rev = "v${version}"; + sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b"; + }; + + modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj"; + + meta = with stdenv.lib; { + description = "A utility to examine and validate certificates in a variety of formats"; + homepage = "https://github.com/square/certigo"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 424d97a472997..852bb33777817 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -8,13 +8,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.12"; + version = "3.13"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0m2cq41mz5209csr07gsnmslqvqdxk2p1l2saa23ddnaybqnjy16"; + sha256 = "1kasnzd8hw9biyx8avbjmpfax1pdbp9g543g8hs6xpksmk93hl82"; }; preBuild = '' diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 8fdb75892e804..3c52e1944d8f6 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.0"; + version = "1.13.1"; name = "wimlib-${version}"; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${name}.tar.gz"; - sha256 = "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai"; + sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; }; preBuild = '' diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 42e88f8d07a47..1c0e08a2dbbdd 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,37 +1,23 @@ { stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810 - msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec { - version = "0.5.6"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; - }; - }); - }; - }; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.9"; + version = "1.1.10"; - src = python.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; + sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python.pkgs.setuptools_scm + libb2 lz4 zstd openssl python3.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python.pkgs; [ - cython msgpack-python + propagatedBuildInputs = with python3.pkgs; [ + cython ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' @@ -64,7 +50,7 @@ in python.pkgs.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; - checkInputs = with python.pkgs; [ + checkInputs = with python3.pkgs; [ pytest ]; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 6441ae5dbd1b5..015408351fde5 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "android-file-transfer-${version}"; - version = "3.7"; + pname = "android-file-transfer"; + version = "3.8"; + src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; + sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc"; }; - buildInputs = [ cmake fuse readline pkgconfig qtbase ]; - buildPhase = '' - cmake . - make - ''; - installPhase = '' - make install - ''; + + nativeBuildInputs = [ cmake readline pkgconfig ]; + buildInputs = [ fuse qtbase ]; + meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; homepage = https://whoozle.github.io/android-file-transfer-linux/; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c33ae4e8304ab..72e514fff6b08 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-04-04"; + version = "2019-05-08"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "d13bbb2955f899f10be4ab315ad229d2951fdcda"; - sha256 = "0cjy12qjd572sbg8h4i18fn001p6a6ahc4ljwids58nv83q99ll3"; + rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1"; + sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ebb9db8670e35..aaa6772b98e84 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.20.2"; + version = "5.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0z0fm3j4ajzsf445381ra8r3zzciyyvfh8vvbjmbyarg2rz8n3w9"; + sha256 = "0dgh56pamav8wb9nmabjwdlpcazvqc9pgzwablxn77mqh0qrhkaq"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix new file mode 100644 index 0000000000000..46635aa67412b --- /dev/null +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: + +stdenv.mkDerivation rec { + + pname = "cpcfs"; + version = "0.85.4"; + + src = fetchFromGitHub { + owner = "derikz"; + repo = "cpcfs"; + rev = "v${version}"; + sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-ltermcap' '-lncurses' \ + --replace '-L /usr/lib/termcap' ' ' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/man/man1 + cp cpcfs $out/bin + ronn --roff ../template.doc --pipe > $out/man/man1/cpcfs.1 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/derikz/cpcfs/" ; + license = licenses.bsd2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 617457f55b61d..72ed4f0ee1b4a 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -2,23 +2,14 @@ stdenv.mkDerivation rec { - repo = "idsk"; - version = "unstable-2018-02-11"; - rev = "1846729ac3432aa8c2c0525be45cfff8a513e007"; - name = "${repo}-${version}"; - - meta = with stdenv.lib; { - description = "Manipulating CPC dsk images and files"; - homepage = https://github.com/cpcsdk/idsk ; - license = "unknown"; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - }; + pname = "idsk"; + version = "0.19"; src = fetchFromGitHub { - inherit rev repo; + repo = "idsk"; owner = "cpcsdk"; - sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv"; + rev = "v${version}"; + sha256 = "0b4my5cz5kbzh4n65jr721piha6zixaxmfiss2zidip978k9rb6f"; }; nativeBuildInputs = [ cmake ]; @@ -27,4 +18,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp iDSK $out/bin ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/cpcsdk/idsk" ; + license = licenses.mit; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6acb034d75b67..3b9e4a0210801 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; + sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; + sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.978"; + version = "0.1.5.1010"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index a6b3ba01bfa40..57a6c8c9673cd 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre, runtimeShell }: +{ stdenv, fetchurl, jre, makeWrapper }: let @@ -14,13 +14,13 @@ in stdenv.mkDerivation { inherit sha256; }; + nativeBuildInputs = [makeWrapper]; + installPhase = '' mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!${runtimeShell}" > "$out/bin/briss" - echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" - chmod +x "$out/bin/briss" + makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" ''; meta = { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index f9d3c53854b46..77ec251ec8816 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.10"; + version = "1.5.11"; meta = with stdenv.lib; { isIbusEngine = true; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc"; + sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix index e6505f3cc4680..1115e4e232fc9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix @@ -1,5 +1,5 @@ { typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper -, langs ? [ "de-de" "en-us" "es-es" "it-it" "sv-se" "sv-fi" ] +, langs ? [ "de-de" "en-us" "es-es" "fr-moderne" "it-it" "sv-se" "sv-fi" ] }: let diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix new file mode 100644 index 0000000000000..6d24f3a447358 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "fluent-bit"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "fluent"; + repo = "fluent-bit"; + rev = "8cc3a1887c3fcd6dd95a4a475fb213a0e399c222"; + sha256 = "0rmdbrhhrim80d0hwbz56d5f8rypm6h62ks3xnr0b4w987w10653"; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace /lib/systemd $out/lib/systemd + ''; + + meta = with stdenv.lib; { + description = "Log forwarder and processor, part of Fluentd ecosystem"; + homepage = "https://fluentbit.io"; + maintainers = with maintainers; [ + samrose + ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 846fa8e8aca00..bdb919006fd0d 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi"; + sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj"; }; dontBuild = true; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index a00da33d8c91e..e48d6354eb53b 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, finger_bsd, makeWrapper +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper , abook ? null , gnupg ? null , goobook ? null @@ -32,7 +32,14 @@ stdenv.mkDerivation { ++ optional (khard != null) "--with-khard" ++ optional (mu != null) "--with-mu"; - patches = [ ./add-methods-to-rc.patch ]; + patches = [ ./add-methods-to-rc.patch + # fix undefined exec_prefix. Remove with the next release + (fetchpatch { + url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; + sha256 = "129zg086glmlalrg395jq8ljcp787dl3rxjf9v7apsd8mqfdkl2v"; + excludes = [ "debian/changelog" ]; + }) + ]; postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + "${AuthenSASL}/${perl.libPrefix}" + ":${ConvertASN1}/${perl.libPrefix}" @@ -43,6 +50,6 @@ stdenv.mkDerivation { license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; - maintainers = [ maintainers.kaiha ]; + maintainers = [ maintainers.kaiha maintainers.bfortz ]; }; } diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 78dba7e3a6f0b..3b9fc5ae691dc 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Peltoche"; - repo = "lsd"; + repo = pname; rev = version; - sha256 = "1k054c4mz0z9knfn7kvvs3305z2g2w44l0cjg4k3cax06ic1grlr"; + sha256 = "1m8jcmdp66n0vgyzfgknmg4rwc41y9fd4vjgapaggg6lc9cc68gp"; }; - cargoSha256 = "0pg4wsk2qaljrqklnl5p3iv83314wmybyxsn1prvsjsl4b64mil9"; + cargoSha256 = "095jf63jyd485fk8pl7grvycn7pkwnxdm5lwkmfl9p46m8q1qqr2"; preFixup = '' install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 7bebc26d7ec2f..b1d1971c75c7f 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,23 +1,15 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "memtest86+-5.01+coreboot-20180113"; + pname = "memtest86+"; + version = "5.01-coreboot-002"; src = fetchgit { - url = "https://review.coreboot.org/memtest86plus"; - rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3"; - sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk"; + url = "https://review.coreboot.org/memtest86plus.git"; + rev = "v002"; + sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk"; }; - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; hardeningDisable = [ "all" ]; @@ -27,13 +19,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails installPhase = '' - mkdir -p $out - chmod -x memtest.bin - cp memtest.bin $out/ + install -Dm0444 -t $out/ memtest.bin ''; meta = { - homepage = http://www.memtest.org/; + homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix deleted file mode 100644 index 2e364e33fc68f..0000000000000 --- a/pkgs/tools/misc/memtest86/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "memtest86-4.3.6"; - - src = fetchurl { - url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; - sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; - }; - - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - - NIX_CFLAGS_COMPILE = "-I."; - - installPhase = '' - mkdir -p $out - cp memtest.bin $out/ - ''; - - meta = { - homepage = http://memtest86.com/; - description = "A tool to detect memory errors, to be run from a bootloader"; - broken = true; - }; -} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 98dc79fbe11a7..97c1f5100aba0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.05.11"; + version = "2019.05.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1y272jgdqwhf2njzqfln80zb2pmw83rvp6lxza6wghb7cld249j1"; + sha256 = "18xwdfvpkqrnj0kb8xj8hgwhgiqpv7x7x7zzr4x3vynb9grcv9m8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 9cca93040dd71..33f004190e409 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.4"; + version = "3.5"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "17vb1sy79lsjif23v66mgn39lbgmxy59mf7mi9ffb9qh4ryf8xxg"; + sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; }; postPatch = '' diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 5e2b27c6516c8..5261fdb18960b 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, libresolv }: +{ stdenv, fetchurl, libresolv, perl }: stdenv.mkDerivation rec { - version = "1.9"; - name = "dnstracer-${version}"; + version = "1.10"; + pname = "dnstracer"; src = fetchurl { - url = "https://www.mavetju.org/download/${name}.tar.gz"; - sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; + url = "https://www.mavetju.org/download/${pname}-${version}.tar.bz2"; + sha256 = "089bmrjnmsga2n0r4xgw4bwbf41xdqsnmabjxhw8lngg2pns1kb4"; }; outputs = [ "out" "man" ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; + setOutputFlags = false; + installPhase = '' + install -Dm755 -t $out/bin dnstracer + install -Dm755 -t $man/share/man/man8 dnstracer.8 + ''; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index c7d06274bea0e..ba76c37a4bba3 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { name = "horst-${version}"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "br101"; repo = "horst"; - rev = "version-${version}"; - sha256 = "0m7gc6dj816z8wyq5bdkqj7fw6rmxaah84s34ncsaispz2llva1x"; + rev = "v${version}"; + sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses libnl ]; - installPhase = '' - mkdir -p $out/bin - mv horst $out/bin - - mkdir -p $out/man/man1 - cp horst.1 $out/man/man1 - ''; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix index 0e41163577e7c..81a43d672fdc7 100644 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core, - glib, opensm, perl, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core +, opensm, perl, makeWrapper }: stdenv.mkDerivation rec { name = "infiniband-diags-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "infiniband-diags"; rev = version; - sha256 = "1qgyyvnig28x1m47df0zx6b2rcb5nm1k8r02zx7wzfb5pn9k2zh1"; + sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - buildInputs = [ rdma-core glib opensm perl ]; + buildInputs = [ rdma-core opensm perl ]; preConfigure = '' export CFLAGS="-I${opensm}/include/infiniband" diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 89d6a9b454da0..686bb1d7ebf35 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, patchelfUnstable }: with stdenv.lib; @@ -24,13 +24,18 @@ stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ patchelfUnstable ]; + unpackPhase = "cp $src ngrok"; buildPhase = "chmod a+x ngrok"; installPhase = '' install -D ngrok $out/bin/ngrok - ''; + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/ngrok + ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json index 3d7aa8a56b6c6..591e54a6f8152 100644 --- a/pkgs/tools/networking/ngrok-2/versions.json +++ b/pkgs/tools/networking/ngrok-2/versions.json @@ -1,32 +1,32 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/jqJ2Vvh67gW/ngrok-2.3.18-linux-386", - "sha256": "2bebb8f39a3c19ca03eaf786b97c92876216d2297046e85271478edef2cd6404", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/6i2VnqLBZqg/ngrok-2.3.29-linux-386", + "sha256": "c0859f783e66a661dc1490e0cec95dfcce0ae77deaf0aa1838613afcbd8f9451", + "version": "2.3.29" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/ik4d9aurG9/ngrok-2.3.18-linux-amd64", - "sha256": "75e19c343a208bf0e2d3b613d2fa3ce67abbf25c04a1d6be670598a4c25c1694", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/6ws4BqFTLXR/ngrok-2.3.29-linux-amd64", + "sha256": "625e85af6d366be4cc54ba296a6e66d3311b99db36e6ea5fe7f88941874daabb", + "version": "2.3.29" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/c2KRZoJ5cb6/ngrok-2.3.18-linux-arm", - "sha256": "af4cdb9f116104921d7fbeeac9124e545a45495b3623b2b46da996400c305d9c", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/3Qx4EX7AtXt/ngrok-2.3.29-linux-arm", + "sha256": "8a2ec453b407bb0983d22819f3b76044100870888cc976fbf76ced18e6f66fa7", + "version": "2.3.29" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/b2NBP9tpq2E/ngrok-2.3.18-linux-arm64", - "sha256": "9e5fa5b83dc65803291b59867c664085de248a4adb3d415c4dbba1dae90a0aaf", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/7qbe9PkG69E/ngrok-2.3.29-linux-arm64", + "sha256": "c49a9c95dc0128e8129f9b7291b5049a45d13f27bb309ca8af59e498f98b97d0", + "version": "2.3.29" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/879TXbRQQRV/ngrok-2.3.18-darwin-amd64", - "sha256": "abb643bdba7ade5dabd60488b866804d814a41d4d7144fa09e01c9260e93659d", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/eqL9fYWPxoV/ngrok-2.3.29-darwin-amd64", + "sha256": "916ad7b4706e4c770eb58667c5beabf227daa1ad35bbbee41883eb2bce3f254b", + "version": "2.3.29" } } diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 020feb2c43b9b..4b30c89796785 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.3.4"; + version = "4.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "24cb04939110cffcdd7062d2f50c6f61159dc3e0ca3b8aecbae6ade53ad3dc8c"; + sha256 = "0011cks5qizq1rl8iwm683gmb9dlx134p8az32vqm8sbivggv9c1"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 3bcb1460a7009..732687ecfa15f 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig , iproute, lzo, openssl, pam , useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null , pkcs11Support ? false, pkcs11helper ? null, @@ -33,6 +33,13 @@ in stdenv.mkDerivation rec { ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; + patches = [ + ( fetchpatch { + url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch"; + sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm"; + }) + ]; + configureFlags = optionals stdenv.isLinux [ "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index aa5a3e9f6f11c..5b923748c673e 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,32 +1,26 @@ -{ stdenv, pythonPackages, fetchurl, makeWrapper }: +{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }: -with pythonPackages; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "photon"; - version = "1.0.7"; + version = "1.3.0"; - src = fetchurl { - url = "https://github.com/s0md3v/Photon/archive/v${version}.tar.gz"; - sha256 = "0c5l1sbkkagfxmh8v7yvi6z58mhqbwjyr7fczb5qwxm7la42ah9y"; + src = fetchFromGitHub { + owner = "s0md3v"; + repo = "Photon"; + rev = "v${version}"; + sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy"; }; - patches = [ ./destdir.patch ]; - postPatch = '' - substituteInPlace photon.py --replace DESTDIR $out/share/photon - ''; - dontBuild = true; doCheck = false; - propagatedBuildInputs = [ - requests - urllib3 - ]; + + propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ]; installPhase = '' mkdir -p "$out"/{bin,share/photon} cp -R photon.py core plugins $out/share/photon - makeWrapper ${python.interpreter} $out/bin/photon \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --add-flags "-O $out/share/photon/photon.py" ''; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 4f9dba1d62f25..b22a3f464d3cd 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -2,21 +2,27 @@ buildGoModule rec { pname = "shadowfox"; - version = "1.7.20"; + version = "2.0.1"; src = fetchFromGitHub { owner = "SrKomodo"; repo = "shadowfox-updater"; rev = "v${version}"; - sha256 = "14crips12l4n050b8hrqkfqbxl0l8s3y4y9lm8n0bjpxdpjbpr7q"; + sha256 = "0j8ljnx281a5nwd3zpw7b25ndsxc26b52glk2hqhm5fh08f9w0d8"; }; goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "143ky1fj7xglhjyzh78qzgh1m4j53kqps25c9vnq9q4vdyzm93sr"; + modSha256 = "0anxrff09r5aw3a11iph0gigmcbmpfczm8him6ly57ywfzc5c850"; buildFlags = "--tags release"; + postInstall = '' + # Contains compiler package only used by projects CI, and buildGoModule + # installs all binaries by default. So we remove this again. + rm $out/bin/compiler + ''; + meta = with stdenv.lib; { description = '' This project aims at creating a universal dark theme for Firefox while diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index 715a480e28dd9..f6afddaba3817 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ubridge-${version}"; - version = "0.9.15"; + version = "0.9.16"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "0fl07zyall04map6v2l1bclqh8y3rrhsx61s2v0sr8b00j201jg4"; + sha256 = "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"; }; postPatch = '' diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 43a8c4644639e..ca3fa8eca9628 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2019-04-23"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; - sha256 = "1ksr8fw5p5ai2a02whppc0kz9b3m5363hvfjghkzkd623kfh9073"; + rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe"; + sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index f9d2855e739fc..16811d8f8897f 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openmp ]; - buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ]; + buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ]; installFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index f7e09d54de160..c72bc6d8b9e89 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue, libusb1 }: buildGoPackage rec { - name = "bettercap-${version}"; - version = "2.11"; + pname = "bettercap"; + version = "2.24"; goPackagePath = "github.com/bettercap/bettercap"; src = fetchFromGitHub { - owner = "bettercap"; - repo = "bettercap"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "08hd7hk0jllfhdiky1f5pfsvl1x0bkgv1p4z9qvsksdg9a7qjznw"; + sha256 = "1f8bzxbcyf0bpyqj6hz4l8dp5xknnb537xy9y5skcznp03i44h55"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue ]; + buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; goDeps = ./deps.nix; diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix index cbfe7c54dad9c..ef09a821317e9 100644 --- a/pkgs/tools/security/bettercap/deps.nix +++ b/pkgs/tools/security/bettercap/deps.nix @@ -10,12 +10,39 @@ }; } { + goPackagePath = "github.com/antchfx/jsonquery"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/jsonquery"; + rev = "a2896be8c82bb2229d1cf26204863180e34b2b31"; + sha256 = "0mh6v21i3v3sxqjln7vph6wx3sm79p99010in9am1wh7k30rrjl5"; + }; + } + { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "ce1d48779e67a1ddfb380995fe532b2e0015919c"; + sha256 = "0brd75mhd5ix7rz1ijhbggyp53v6g8kz9bc2n7g6zwavzxarfj5p"; + }; + } + { goPackagePath = "github.com/bettercap/gatt"; fetch = { type = "git"; url = "https://github.com/bettercap/gatt"; - rev = "66e7446993acb3de936b3f487e5933522ed16923"; - sha256 = "0hvm59zpbghgw8fq9yr4dd2x3209ii9856qklflkz2ywf7vryjqq"; + rev = "fac16c0ad797bbccae1fe4acf49761b98f7516e7"; + sha256 = "08pyg4caw7lzb230l3k4rwgvn68zz6kmrlsdapaf3wa216pphyd9"; + }; + } + { + goPackagePath = "github.com/bettercap/nrf24"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/nrf24"; + rev = "aa37e6d0e0eb125cee9ec71ed694db2ad58b509a"; + sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj"; }; } { @@ -28,6 +55,15 @@ }; } { + goPackagePath = "github.com/bettercap/recording"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/recording"; + rev = "3ce1dcf032e391eb321311b34cdf31c6fc9523f5"; + sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23"; + }; + } + { goPackagePath = "github.com/chifflier/nfqueue-go"; fetch = { type = "git"; @@ -50,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/elazarl/goproxy"; - rev = "f58a169a71a51037728990b2d3597a14f56b525b"; - sha256 = "103crrh6zwdwcj7j6z63rbm467nff3r1rvpwdk0qj8x275zi45g6"; + rev = "9d40249d3c2f14d1a9d75e070a738362adeb5a83"; + sha256 = "0hpzna9dvs2ff0bj8baz3sc5gg49vqmb0cbi6p061lmwl09cd00i"; }; } { @@ -59,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/evilsocket/islazy"; - rev = "3d8400c74f9dbc626d913e0575cda05d914bea57"; - sha256 = "0yfqvcxaympfgsda0jhqnaqhbhic2irdjn0h2bppz4misjv6sxn9"; + rev = "c5c7a41bb1c20e6df409825ed24af8de5fb7fb70"; + sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3"; }; } { @@ -95,17 +131,17 @@ fetch = { type = "git"; url = "https://github.com/google/gopacket"; - rev = "d67ddb98d5a1b7c79a8977ec2d552e1db45eda86"; - sha256 = "0pk4hddx6fnbbjjgi86vx12xs5d8591dlkx1q5cswc0jghymbplh"; + rev = "v1.1.16"; + sha256 = "1vnjgjz52l1bzrhx70qpvmwandf8v13zhiaj3rdljsphdp5cgadi"; }; } { - goPackagePath = "github.com/gorilla/context"; + goPackagePath = "github.com/google/gousb"; fetch = { type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + url = "https://github.com/google/gousb"; + rev = "64d82086770b8b671e1e7f162372dd37f1f5efba"; + sha256 = "1kjgg8cdp8wz9rck4nh48pcia741p7a8w2nikhzxsscn0ld33109"; }; } { @@ -113,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + rev = "c5c6c98bc25355028a63748a498942a6398ccd22"; + sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62"; }; } { @@ -127,6 +163,15 @@ }; } { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "06dd1a31b32c42d4d6c2cf8dbce70597d1118f54"; + sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; + }; + } + { goPackagePath = "github.com/inconshreveable/go-vhost"; fetch = { type = "git"; @@ -140,8 +185,17 @@ fetch = { type = "git"; url = "https://github.com/jpillora/go-tld"; - rev = "4bfc8d9a90b591e101a56265afc2239359fb0810"; - sha256 = "04pv1rwpfq3ip3vn0yfixxczcnv56w1l0z8bp4fjscw1bfqbb4pn"; + rev = "f16ca3b7b383d3f0373109cac19147de3e8ae2d1"; + sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "88f551ae580780cc79d12ab4c218ba1ca346b83a"; + sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w"; }; } { @@ -158,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -167,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -176,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/dhcp6"; - rev = "e26af0688e455a82b14ebdbecf43f87ead3c4624"; - sha256 = "0fvw8zz2yhla03jfb79bby9vg4rbmaj39v00ypb8yl4fb696zfip"; + rev = "2a67805d7d0b0bad6c1103058981afdea583b459"; + sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw"; }; } { @@ -185,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/raw"; - rev = "67a536258490ec29bca6d465b51dea32c0db3623"; - sha256 = "1fba4c6kc7llwr4n5rsspsc3yb0c81xsqzxv86wnj1b0d8l2s7nr"; + rev = "480b93709cce56651807d3fdeb260a5a7c4e2d5f"; + sha256 = "0a0zlznk67nhpmgp21hxsbhyl5lvlkmwy5xvm3d3q0yaq0rqnh2x"; }; } { @@ -208,12 +262,21 @@ }; } { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "8aa92d4e02c501ba21e26fb92cf2fb9f23f56917"; + sha256 = "1niymj11xv82ghif3p7i60bgj0lqskwm7fmrzfjchd8wxwbk4bbi"; + }; + } + { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -235,12 +298,21 @@ }; } { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a29dc8fdc73485234dbef99ebedb95d2eced08de"; + sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p"; + }; + } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1df9410e1712aa6433dae904ff66a"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + rev = "9ce7a6920f093fc0b908c4a5f66ae049110f417e"; + sha256 = "1kbs85jsqbv4v89ii2zam4b8dhmllhsrf46njmi09x0w6s0b9cbk"; }; } { @@ -248,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fa43e7bc11baaae89f3f902b2b4d832b68234844"; - sha256 = "1z96xhgw930jpd53g1sy9x6wiijgz751czbvr2zzgc55y0md1mfw"; + rev = "d89cdac9e8725f2aefce25fcbfef41134c9ad412"; + sha256 = "0iazr13ir6i267nb2w81lc3pr740wdjs86nsliwpf90kkgzn853f"; }; } { diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/tools/security/dnsenum/default.nix new file mode 100644 index 0000000000000..d764e8a71ae6f --- /dev/null +++ b/pkgs/tools/security/dnsenum/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: + +stdenv.mkDerivation rec { + pname = "dnsenum"; + version = "1.2.4.2"; + + src = fetchFromGitHub { + owner = "fwaeytens"; + repo = pname; + rev = version; + sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v"; + }; + + propagatedBuildInputs = with perlPackages; [ + perl NetDNS NetIP NetNetmask StringRandom XMLWriter NetWhoisIP WWWMechanize + ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -vD dnsenum.pl $out/bin/dnsenum + install -vD dns.txt -t $out/share + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/fwaeytens/dnsenum"; + description = "A tool to enumerate DNS information"; + maintainers = with maintainers; [ c0bw3b globin ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix new file mode 100644 index 0000000000000..06270723f4d05 --- /dev/null +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "dnsrecon"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "darkoperator"; + repo = pname; + rev = version; + sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy"; + }; + + format = "other"; + + pythonPath = with python3.pkgs; [ + dns netaddr lxml + ]; + + postPatch = '' + substituteInPlace dnsrecon.py \ + --replace "namelist.txt" "../share/namelist.txt" \ + --replace "0.9.0" "${version}" + ''; + + installPhase = '' + runHook preInstall + + install -vD dnsrecon.py $out/bin/dnsrecon + install -vD namelist.txt subdomains-*.txt -t $out/share + install -vd $out/${python3.sitePackages}/ + cp -R lib tools msf_plugin $out/${python3.sitePackages} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "DNS Enumeration Script"; + homepage = "https://github.com/darkoperator/dnsrecon"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ c0bw3b globin ]; + }; +} diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix new file mode 100644 index 0000000000000..abc1bacd212bc --- /dev/null +++ b/pkgs/tools/security/fierce/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "fierce"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mschwager"; + repo = pname; + rev = version; + sha256 = "0cdp9rpabazyfnks30rsf3qfdi40z1bkspxk4ds9bm82kpq33jxy"; + }; + + propagatedBuildInputs = [ python3.pkgs.dns ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mschwager/fierce"; + description = "DNS reconnaissance tool for locating non-contiguous IP space"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ c0bw3b globin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 65eec89a09fcf..b43be1a692403 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }: +{ thinkpad ? false +, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null +, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-${version}"; + pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.8.1"; src = fetchurl { @@ -10,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; }; - buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; + buildInputs = [ glib dbus-glib polkit nss pam systemd ] + ++ stdenv.lib.optional thinkpad libfprint-thinkpad + ++ stdenv.lib.optional (!thinkpad) libfprint; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 3bf906fb4c125..b3dc1270fb9c7 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { name = "libmodsecurity-${version}"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "0jhyqsvcjxq9ybndcinc08awknrg3sbkaby5w3qw03aqbfjkpywc"; + sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; - buildInputs = [ doxygen perl valgrind curl geoip libxml2 lmdb lua pcre yajl]; + buildInputs = [ perl valgrind curl geoip libxml2 lmdb lua pcre yajl ]; configureFlags = [ "--enable-static" @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-yajl=${yajl}" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = '' ModSecurity v3 library component. diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index af507dbf993b1..ed1cda8030f27 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -2,7 +2,7 @@ , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg, coreutils # For the tests: -, bash, openssh, which, socat, cpio, hexdump, openssl +, bash, openssh, which, socat, cpio, hexdump, procps, openssl }: let @@ -14,14 +14,14 @@ let }); in stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.43"; + version = "0.44"; # The patched OpenSSH binary MUST NOT be used (except in the check phase): disallowedRequisites = [ opensshUnsafe ]; src = fetchurl { url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; - sha256 = "18i7qpvp5qb7mmd0z5rqai550rya9l3nbsq2hamwkl3smqsjdqc0"; + sha256 = "1ah7hy8r9gj96pni8azzjb85454qky5l17m3pqn37854l6grgika"; }; patches = [ ./monkeysphere.patch ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] ++ stdenv.lib.optional doCheck - ([ gnupg opensshUnsafe which socat cpio hexdump lockfileProgs ] ++ + ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); makeFlags = '' @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = let wrapperArgs = runtimeDeps: "--prefix PERL5LIB : " - + (with perlPackages; makePerlPath [ + + (with perlPackages; makePerlPath [ # Optional (only required for keytrans) CryptOpenSSLRSA CryptOpenSSLBignum ]) @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] - + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ] + + wrapPrograms [ gnupg lockfileProgs ] [ "monkeysphere" ] + '' # These 4 programs depend on the program name ($0): for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index 0a05635d6a808..8cdd85017b93e 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -10,15 +10,6 @@ diff --git a/Makefile b/Makefile -e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \ -e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' -diff --git a/src/share/checkperms b/src/share/checkperms ---- a/src/share/checkperms -+++ b/src/share/checkperms -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/usr/bin/perl - - # checkperms: ensure as best we can that a given file can only be - # modified by the given user (or the superuser, naturally). This diff --git a/src/share/keytrans b/src/share/keytrans --- a/src/share/keytrans +++ b/src/share/keytrans @@ -28,17 +19,5 @@ diff --git a/src/share/keytrans b/src/share/keytrans # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -diff --git a/tests/basic b/tests/basic ---- a/tests/basic -+++ b/tests/basic -@@ -343,7 +340,7 @@ if [ "$MONKEYSPHERE_TEST_USE_ED25519" = true ]; then - echo "### generating ed25519 key for testuser..." - # from the imported secret key - USER_FPR=8A4B353B4CBA6F30625498BAE00B5EEEBA79B482 -- gpg --quick-add-key "$USER_FPR" ed25519 auth 2d -+ gpg --no-tty --quick-add-key "$USER_FPR" ed25519 auth 2d - else - echo "### generating standard monkeysphere key for testuser..." - monkeysphere gen-subkey -- 2.16.3 diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bd59309096597..3bc5758aad44b 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, pkgconfig, openssl, lua5_3 +{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 , graphicalSupport ? false , libX11 ? null , gtk2 ? null @@ -27,7 +27,17 @@ in stdenv.mkDerivation rec { sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; }; - patches = ./zenmap.patch; + patches = [ ./zenmap.patch ] + ++ optionals stdenv.cc.isClang [( + # Fixes a compile error due an ambiguous reference to bind(2) in + # nping/EchoServer.cc, which is otherwise resolved to std::bind. + # Also fixes a missing include. + # https://github.com/nmap/nmap/pull/1363 + fetchpatch { + url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff"; + sha256 = "088r8ylpc9hachsxs4r17cqfa1ncyspbjvkc573lill7rk1r9m0s"; + } + )]; prePatch = optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 5170805e3f642..f14a08c8174a7 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 -, Carbon, PCSC +, Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin }: @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - autoreconfHook zlib readline openssl libassuan + zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { else "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" + (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC @@ -58,5 +60,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index 1bb621eab362d..a97bc57ad45f3 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "passff-host-${version}"; - version = "1.0.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "passff"; repo = "passff-host"; rev = version; - sha256 = "1zks34rg9i8vphjrj1h80y5rijadx33z911qxa7pslf7ahmjqdv3"; + sha256 = "0ydfwvhgnw5c3ydx2gn5d7ys9g7cxlck57vfddpv6ix890v21451"; }; buildInputs = [ python3 ]; patchPhase = '' - sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py + sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py ''; - preBuild = "cd src"; - postBuild = "cd .."; - installPhase = '' install -D bin/testing/passff.py $out/share/passff-host/passff.py cp bin/testing/passff.json $out/share/passff-host/passff.json diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 256423892c485..a3e6468c4feec 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs"; + sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899"; }; prePatch = '' diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 0c0cf29f977fe..4a1e92e6104a8 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,21 +1,20 @@ -{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, makeWrapper, python3Packages }: stdenv.mkDerivation rec { pname = "theHarvester"; - version = "2.7.1"; - name = "${pname}-${version}"; + version = "3.0.6"; src = fetchFromGitHub { owner = "laramies"; - repo = "${pname}"; - rev = "25553762d2d93a39083593adb08a34d5f5142c60"; - sha256 = "0gnm598y6paz0knwvdv1cx0w6ngdbbpzkdark3q5vs66yajv24w4"; + repo = pname; + rev = version; + sha256 = "0f33a7sfb5ih21yp1wspb03fxsls1m14yizgrw0srfirm2a6aa0c"; }; nativeBuildInputs = [ makeWrapper ]; # add dependencies - propagatedBuildInputs = [ python2Packages.requests ]; + propagatedBuildInputs = with python3Packages; [ requests beautifulsoup4 plotly ]; installPhase = '' # create dirs diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1e2882e1f1feb..1c1da724676d3 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = let gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); # use older `lvm2` source for osquery, the 2.03 sourcetree diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index c906d430d8f68..6999be1c92f4d 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.20.1"; + version = "3.21.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56"; + sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index d9acf106e2eae..3ad6f0d3ecccc 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.0"; + version = "4.2.1"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "1bf5jbzqvgpvhbkprynxj75ilk3r6zld157vjf6k7l5g21cwyn9d"; + sha256 = "10d68iz7g4wjiw14blcrbhvdckbi0754bc55ladsszg7gs79wip0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 514085bee64e6..aa53aeb42061f 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,35 +1,18 @@ { - mkDerivation, lib, fetchgit, fetchpatch, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, wrapGAppsHook, kcrash, kconfig, kinit, kparts }: mkDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-2017-02-19"; + pname = "kdiff3"; + version = "1.8.1"; - src = fetchgit { - # gitlab is outdated - url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; - sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; - rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; }; - setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; - - patches = [ - (fetchpatch { - name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2 - url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch"; - sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y"; - }) - ]; - patchFlags = "-p 2"; - - postPatch = '' - sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp - ''; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/pkgs/tools/text/ruby-zoom/Gemfile.lock index 107e896dd6d6b..820a972d106d2 100644 --- a/pkgs/tools/text/ruby-zoom/Gemfile.lock +++ b/pkgs/tools/text/ruby-zoom/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - djinni (2.1.1) - fagin (~> 1.0, >= 1.0.0) - fagin (1.0.0) - hilighter (1.1.0) - json_config (0.1.2) - ruby-zoom (5.0.1) - djinni (~> 2.1, >= 2.1.1) - fagin (~> 1.0, >= 1.0.0) - hilighter (~> 1.1, >= 1.1.0) - json_config (~> 0.1, >= 0.1.2) - scoobydoo (~> 0.1, >= 0.1.4) - scoobydoo (0.1.4) + djinni (2.2.4) + fagin (~> 1.2, >= 1.2.1) + fagin (1.2.1) + hilighter (1.2.3) + json_config (1.1.0) + ruby-zoom (5.3.0) + djinni (~> 2.2, >= 2.2.4) + fagin (~> 1.2, >= 1.2.1) + hilighter (~> 1.2, >= 1.2.3) + json_config (~> 1.0, >= 1.0.0) + scoobydoo (~> 1.0, >= 1.0.0) + scoobydoo (1.0.0) PLATFORMS ruby @@ -21,4 +21,4 @@ DEPENDENCIES ruby-zoom BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix index 36374e54e1659..f4c637aadf887 100644 --- a/pkgs/tools/text/ruby-zoom/gemset.nix +++ b/pkgs/tools/text/ruby-zoom/gemset.nix @@ -1,52 +1,64 @@ { djinni = { dependencies = ["fagin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00zfgd7zx2p9xjc64xm4iwdxq2bb6n1z09nw815c2f4lvlaq269f"; + sha256 = "18zk80jk70xq1bnsvzcgxb13x9fqdb5g4m02b2f6mvqm4cyw26pl"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.4"; }; fagin = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jryqrgb5jvz0m7p91c2bhn6gdwxn9jfdaq3cfkirc3y7yfzv131"; + sha256 = "0psyydh4hf2s1kz0r50aiyjf5v2pqhkbmy0gicxzaj5n17q2ga24"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.1"; }; hilighter = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sy59nfcfk4p1fnrdkipi0mvsj9db17chrx7lb2jg3majbr1wz59"; + sha256 = "03zm49g96dfpan5fhblcjxrzv7ldwan57sn0jcllkcmrqfd0zlyz"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.3"; }; json_config = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q3q0j9s8w93lzxa7rrvh5wqk11np7s2nmgmdlrh8gl3w76xcz6"; + sha256 = "0slb618n1ipn47j6dsxbfv2j9pl06dxn2i651llix09d529m7zwa"; type = "gem"; }; - version = "0.1.2"; + version = "1.1.0"; }; ruby-zoom = { dependencies = ["djinni" "fagin" "hilighter" "json_config" "scoobydoo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0115kbz6l8srzizs77k9l0585lg93x90kg49jjpan7ssm786q05j"; + sha256 = "0iqxc0rzypsxy4wbxnvgvk98dbcsrcczq3xi9xd4wz4ggwq564l3"; type = "gem"; }; - version = "5.0.1"; + version = "5.3.0"; }; scoobydoo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w83zgip3qvh20pgqgcp9yp0k35ypn7ny0d61xcv1ik0r3ab8ga0"; + sha256 = "162p75nc9x078kqcpdsrsd7kngs6jc5n4injz3kzpwf0jgbbm8n7"; type = "gem"; }; - version = "0.1.4"; + version = "1.0.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index c040677118e99..906d9be0f1ecc 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake qttools flex bison ]; buildInputs = [ qtbase libsForQt5.poppler ]; - enableParallelBuilding = true; + # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory + enableParallelBuilding = false; meta = with stdenv.lib; { description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4bea8b80334f..628e19ce82b58 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -181,6 +181,7 @@ mapAliases ({ m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 + memtest86 = memtest86plus; # added 2019-05-08 midoriWrapper = midori; # added 2015-01 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 @@ -255,7 +256,6 @@ mapAliases ({ # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; procps-ng = procps; # added 2018-06-08 - pstree = psmisc; # added 2019-05-05 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9afc88c12c76..6b76d509ea1af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ in } ''); + addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -649,6 +651,8 @@ in altermime = callPackage ../tools/networking/altermime {}; + alttab = callPackage ../tools/X11/alttab { }; + amule = callPackage ../tools/networking/p2p/amule { }; amuleDaemon = appendToName "daemon" (amule.override { @@ -697,6 +701,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + certigo = callPackage ../tools/admin/certigo { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { @@ -1932,11 +1938,7 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + bettercap = callPackage ../tools/security/bettercap { }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; @@ -2280,6 +2282,8 @@ in convoy = callPackage ../tools/filesystems/convoy { }; + cpcfs = callPackage ../tools/filesystems/cpcfs { }; + cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { }; @@ -2437,10 +2441,14 @@ in dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; + dnsenum = callPackage ../tools/security/dnsenum { }; + dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnsperf = callPackage ../tools/networking/dnsperf { }; + dnsrecon = callPackage ../tools/security/dnsrecon { }; + dnstop = callPackage ../tools/networking/dnstop { }; dhcp = callPackage ../tools/networking/dhcp { }; @@ -2723,6 +2731,8 @@ in enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + endlessh = callPackage ../servers/endlessh { }; + cryfs = callPackage ../tools/filesystems/cryfs { spdlog = spdlog_0; }; @@ -2867,6 +2877,8 @@ in flannel = callPackage ../tools/networking/flannel { }; + flare = callPackage ../games/flare { }; + flashbench = callPackage ../os-specific/linux/flashbench { }; flatpak = callPackage ../development/libraries/flatpak { }; @@ -2875,6 +2887,12 @@ in fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fluent-bit = callPackage ../tools/misc/fluent-bit { + stdenv = gccStdenv; + }; + + fierce = callPackage ../tools/security/fierce { }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { @@ -2985,6 +3003,9 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; + fprintd-thinkpad = fprintd.override { + thinkpad = true; + }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -3447,6 +3468,8 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; + pgloader = callPackage ../development/tools/pgloader { }; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -3570,7 +3593,6 @@ in highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { - # doesn't build with clang_37 inherit (llvmPackages_38) stdenv; }); @@ -4171,6 +4193,10 @@ in openssl = openssl_1_1; }; + # Update this when adding the newest nodejs major version! + nodejs_latest = nodejs-12_x; + nodejs-slim_latest = nodejs-slim-12_x; + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; }); @@ -4440,8 +4466,6 @@ in memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; - memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; @@ -5877,8 +5901,6 @@ in soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {}; - souper = callPackage ../development/compilers/souper { }; - sparsehash = callPackage ../development/libraries/sparsehash { }; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; @@ -6016,6 +6038,8 @@ in svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; + symengine = callPackage ../development/libraries/symengine { }; + sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { @@ -6029,6 +6053,8 @@ in systrayhelper = callPackage ../tools/misc/systrayhelper {}; + Sylk = callPackage ../applications/networking/Sylk {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { @@ -6589,6 +6615,8 @@ in xbanish = callPackage ../tools/X11/xbanish { }; + xbill = callPackage ../games/xbill { }; + xbrightness = callPackage ../tools/X11/xbrightness { }; xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; @@ -7059,7 +7087,6 @@ in clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; - clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { @@ -7718,7 +7745,6 @@ in llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; - llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; @@ -7729,14 +7755,6 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; }); - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_37.tools; - targetLlvmLibraries = targetPackages.llvmPackages_37.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; - }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_38.tools; @@ -8548,8 +8566,8 @@ in self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = spark_22; - spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; + spark = spark_24; + spark_24 = callPackage ../applications/networking/cluster/spark { version = "2.4.3"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ @@ -8636,9 +8654,7 @@ in inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; - guile-lib = callPackage ../development/guile-modules/guile-lib { - guile = guile_2_0; - }; + guile-lib = callPackage ../development/guile-modules/guile-lib { }; guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; @@ -8848,6 +8864,8 @@ in buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; + bpftool = callPackage ../os-specific/linux/bpftool { }; byacc = callPackage ../development/tools/parsing/byacc { }; @@ -9202,6 +9220,8 @@ in graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; + graphene = callPackage ../development/libraries/graphene { }; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -9412,6 +9432,8 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nrfutil = callPackage ../development/tools/misc/nrfutil { }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -9707,6 +9729,10 @@ in vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + whatstyle = callPackage ../development/tools/misc/whatstyle { + inherit (llvmPackages) clang-unwrapped; + }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; @@ -10716,6 +10742,8 @@ in }; gtk2-x11 = gtk2.override { + cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; gdktarget = "x11"; }; @@ -10725,6 +10753,8 @@ in # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { + cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; x11Support = true; }; @@ -11138,6 +11168,8 @@ in then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcbor = callPackage ../development/libraries/libcbor { }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -11302,6 +11334,8 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; + libfido2 = callPackage ../development/libraries/libfido2 { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { }; @@ -11310,6 +11344,9 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; + libfprint-thinkpad = libfprint.override { + thinkpad = true; + }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -12941,6 +12978,8 @@ in rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rttr = callPackage ../development/libraries/rttr { }; + rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; @@ -13154,10 +13193,7 @@ in sphinxsearch = callPackage ../servers/search/sphinxsearch { }; - spice = callPackage ../development/libraries/spice { - celt = celt_0_5_1; - inherit (pythonPackages) pyparsing; - }; + spice = callPackage ../development/libraries/spice { }; spice-gtk = callPackage ../development/libraries/spice-gtk { }; @@ -14737,7 +14773,7 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = callPackage ../servers/http/winstone { }; + winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; xinetd = callPackage ../servers/xinetd { }; @@ -16037,6 +16073,8 @@ in cherry = callPackage ../data/fonts/cherry { }; + cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -16225,6 +16263,8 @@ in junicode = callPackage ../data/fonts/junicode { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; + kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; @@ -16423,6 +16463,8 @@ in qogir-theme = callPackage ../data/themes/qogir { }; + redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; @@ -16522,6 +16564,8 @@ in spleen = callPackage ../data/fonts/spleen { }; + stilo-themes = callPackage ../data/themes/stilo { }; + sudo-font = callPackage ../data/fonts/sudo { }; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; @@ -16965,6 +17009,8 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; + carla = qt5.callPackage ../applications/audio/carla { }; + catfish = callPackage ../applications/search/catfish { }; catimg = callPackage ../tools/misc/catimg { }; @@ -17557,6 +17603,8 @@ in inherit (gnome3) epiphany; + ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; + epic5 = callPackage ../applications/networking/irc/epic5 { }; eq10q = callPackage ../applications/audio/eq10q { }; @@ -18686,6 +18734,8 @@ in libvmi = callPackage ../development/libraries/libvmi { }; + lifelines = callPackage ../applications/misc/lifelines { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) dconf; }; @@ -19109,7 +19159,9 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul {}; + pijul = callPackage ../applications/version-management/pijul { + inherit (llvmPackages) clang libclang; + }; ping = callPackage ../applications/networking/ping { }; @@ -19559,6 +19611,8 @@ in psol = callPackage ../development/libraries/psol { }; + pstree = callPackage ../applications/misc/pstree { }; + ptask = callPackage ../applications/misc/ptask { }; pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; @@ -19791,9 +19845,6 @@ in rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; - }; - rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix { - boost = boost166; llvmPackages = llvmPackages_7; }; @@ -19878,6 +19929,8 @@ in setbfree = callPackage ../applications/audio/setbfree { }; + sfxr = callPackage ../applications/audio/sfxr { }; + sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; shadowfox = callPackage ../tools/networking/shadowfox { }; @@ -20574,7 +20627,7 @@ in vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode { }; + vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; @@ -20582,6 +20635,8 @@ in vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {}); + vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { }; @@ -22144,6 +22199,8 @@ in cmtk = callPackage ../applications/science/biology/cmtk { }; + clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -22832,7 +22889,7 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = callPackage ../applications/science/spyder { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; @@ -24046,6 +24103,8 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; + tdm = callPackage ../games/tdm { }; + newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index a6fa43df92f05..21ce3a91cfd62 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -33,6 +33,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp { }) mathcompGen mathcompGenSingle mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c26f031a08932..57cd6de1b5a43 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -324,15 +324,16 @@ with self; { luaossl = buildLuaPackage rec { name = "luaossl-${version}"; - version = "20170903"; + version = "20181207"; src = fetchurl { - url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; - sha256 = "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3"; + url = "https://github.com/wahern/luaossl/releases/download/rel-${version}/luaossl-rel-${version}.zip"; + sha256 = "194r6db80ksh4zh8d2k35q6vci9zbrfvkanjl280y6ij2xyhkvj7"; }; preConfigure = ''export prefix=$out''; + nativeBuildInputs = [ unzip ]; buildInputs = [ openssl ]; meta = with stdenv.lib; { @@ -379,13 +380,13 @@ with self; { }; luasec = buildLuaPackage rec { - name = "sec-0.6"; + name = "sec-0.8"; src = fetchFromGitHub { owner = "brunoos"; repo = "luasec"; rev = "lua${name}"; - sha256 = "0wv8l7f7na7kw5xn8mjik2wpxbizl7zvvp5s7fcwvz9kl5jdpk5b"; + sha256 = "1cgb7ihnrrfr59a2da4d3chr7lqpid98xpglmzhv3hrpg4x5sksz"; }; propagatedBuildInputs = [ luasocket ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2726810819dc..1439ab716190a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11426,6 +11426,18 @@ let }; }; + NetNetmask = buildPerlPackage rec { + name = "Net-Netmask-1.9104"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMASLAK/${name}.tar.gz"; + sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; + }; + buildInputs = [ Test2Suite TestUseAllModules ]; + meta = { + description = "Parse, manipulate and lookup IP network blocks"; + }; + }; + NetOAuth = buildPerlModule { name = "Net-OAuth-0.28"; src = fetchurl { @@ -11658,6 +11670,22 @@ let }; }; + NetWhoisIP = buildPerlPackage rec { + name = "Net-Whois-IP-1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BS/BSCHMITZ/${name}.tar.gz"; + sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; + }; + + propagatedBuildInputs = [ RegexpIPv6 LWPProtocolhttps ]; + doCheck = false; + + # https://rt.cpan.org/Public/Bug/Display.html?id=99377 + postPatch = '' + substituteInPlace IP.pm --replace " AutoLoader" "" + ''; + }; + NetWorks = buildPerlPackage { name = "Net-Works-0.22"; src = fetchurl { @@ -14141,6 +14169,14 @@ let }; }; + StringRandom = buildPerlModule rec { + name = "String-Random-0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; + }; + }; + StringRewritePrefix = buildPerlPackage { name = "String-RewritePrefix-0.007"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 63886bac8577c..f680f09527538 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -142,6 +142,26 @@ let ]; }; + event = buildPecl rec { + version = "2.5.0"; + pname = "event"; + + sha256 = "1igbxla4s784z7lw1jar6pjyfn596040a52kfmawwclqf9qcvx0v"; + + configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ openssl libevent ]; + + meta = with pkgs.lib; { + description = '' + This is an extension to efficiently schedule I/O, time and signal based + events using the best I/O notification mechanism available for specific platform. + ''; + license = licenses.php301; + homepage = "https://bitbucket.org/osmanov/pecl-event/"; + }; + }; + igbinary = buildPecl rec { version = "3.0.1"; pname = "igbinary"; @@ -347,12 +367,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.6"; + version = "0.11.7"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "016zm9ynh0zi40kclvzql7zxs3pl69cacln2c7n3gsicpswr0qa4"; + sha256 = "0148ygnmj8wwal432isfq3zhf7qw902sfd2llwl6nw4wf0a6kf73"; }; phases = [ "installPhase" ]; @@ -380,6 +400,67 @@ let }; }; + pinba = if isPhp73 then pinba73 else pinba7; + + pinba7 = assert !isPhp73; buildPecl rec { + version = "1.1.1"; + pname = "pinba"; + + src = pkgs.fetchFromGitHub { + owner = "tony2001"; + repo = "pinba_extension"; + rev = "RELEASE_1_1_1"; + sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + }; + + meta = with pkgs.lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + }; + }; + + pinba73 = assert isPhp73; buildPecl rec { + version = "1.1.2-dev"; + pname = "pinba"; + + src = pkgs.fetchFromGitHub { + owner = "tony2001"; + repo = "pinba_extension"; + rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; + sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + }; + + meta = with pkgs.lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + }; + }; + + protobuf = buildPecl rec { + version = "3.7.1"; + pname = "protobuf"; + + sha256 = "0fbf29851dpgjfdgi6i1dgy047dfiazm6qh943w22zbj35l7g2yc"; + + buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; + + meta = with pkgs.lib; { + description = '' + Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. + ''; + license = licenses.bsd3; + homepage = "https://developers.google.com/protocol-buffers/"; + }; + }; + psysh = mkDerivation rec { version = "0.9.9"; pname = "psysh"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7dae4ff91aff5..ce5f76ecce497 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -335,6 +335,8 @@ in { cozy = callPackage ../development/python-modules/cozy { }; + curio = callPackage ../development/python-modules/curio { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dependency-injector = callPackage ../development/python-modules/dependency-injector { }; @@ -403,6 +405,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fasttext = callPackage ../development/python-modules/fasttext { }; + favicon = callPackage ../development/python-modules/favicon { }; fido2 = callPackage ../development/python-modules/fido2 { }; @@ -509,6 +513,8 @@ in { logzero = callPackage ../development/python-modules/logzero { }; + macropy = callPackage ../development/python-modules/macropy { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; manhole = callPackage ../development/python-modules/manhole { }; @@ -591,6 +597,8 @@ in { pathlib = callPackage ../development/python-modules/pathlib { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pdf2image = callPackage ../development/python-modules/pdf2image { }; pdfminer = callPackage ../development/python-modules/pdfminer_six { }; @@ -603,6 +611,8 @@ in { phonopy = callPackage ../development/python-modules/phonopy { }; + piccata = callPackage ../development/python-modules/piccata {}; + pims = callPackage ../development/python-modules/pims { }; plantuml = callPackage ../tools/misc/plantuml { }; @@ -778,6 +788,8 @@ in { slurm = pkgs.slurm; }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; + pyssim = callPackage ../development/python-modules/pyssim { }; pystache = callPackage ../development/python-modules/pystache { }; @@ -844,6 +856,8 @@ in { pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + pytricia = callPackage ../development/python-modules/pytricia { }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); @@ -926,6 +940,9 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; + spyder = callPackage ../development/python-modules/spyder {}; + tenacity = callPackage ../development/python-modules/tenacity { }; tokenserver = callPackage ../development/python-modules/tokenserver {}; @@ -1227,6 +1244,8 @@ in { cement = callPackage ../development/python-modules/cement {}; + cgen = callPackage ../development/python-modules/cgen { }; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; chainer = callPackage ../development/python-modules/chainer { @@ -1775,6 +1794,8 @@ in { locket = callPackage ../development/python-modules/locket { }; + loo-py = callPackage ../development/python-modules/loo-py { }; + tblib = callPackage ../development/python-modules/tblib { }; s3fs = callPackage ../development/python-modules/s3fs { }; @@ -2075,6 +2096,8 @@ in { isbnlib = callPackage ../development/python-modules/isbnlib { }; + islpy = callPackage ../development/python-modules/islpy { }; + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; iniparse = callPackage ../development/python-modules/iniparse { }; @@ -2277,6 +2300,8 @@ in { pylama = callPackage ../development/python-modules/pylama { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; pyphen = callPackage ../development/python-modules/pyphen {}; @@ -2429,6 +2454,8 @@ in { gdal = self.gdal; }; + django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -2604,6 +2631,8 @@ in { fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; + fitbit = callPackage ../development/python-modules/fitbit { }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; @@ -3798,6 +3827,8 @@ in { pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; + pyatmo = callPackage ../development/python-modules/pyatmo { }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; pysam = callPackage ../development/python-modules/pysam { }; @@ -4051,6 +4082,8 @@ in { pyserial = callPackage ../development/python-modules/pyserial {}; + pysonos = callPackage ../development/python-modules/pysonos {}; + pymongo = callPackage ../development/python-modules/pymongo {}; pyperclip = callPackage ../development/python-modules/pyperclip { }; @@ -4368,6 +4401,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + stravalib = callPackage ../development/python-modules/stravalib { }; + streamz = callPackage ../development/python-modules/streamz { }; structlog = callPackage ../development/python-modules/structlog { }; @@ -4471,6 +4506,8 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; + webassets = callPackage ../development/python-modules/webassets { }; webcolors = callPackage ../development/python-modules/webcolors { }; @@ -4561,6 +4598,8 @@ in { pysendfile = callPackage ../development/python-modules/pysendfile { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + qpid-python = callPackage ../development/python-modules/qpid-python { }; xattr = callPackage ../development/python-modules/xattr { }; @@ -4650,6 +4689,10 @@ in { python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + symengine = callPackage ../development/python-modules/symengine { + symengine = pkgs.symengine; + }; + sympy = callPackage ../development/python-modules/sympy { }; pilkit = callPackage ../development/python-modules/pilkit { }; @@ -4790,6 +4833,8 @@ in { unidiff = callPackage ../development/python-modules/unidiff { }; + units = callPackage ../development/python-modules/units { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; @@ -5425,6 +5470,8 @@ in { gensim = callPackage ../development/python-modules/gensim { }; + genpy = callPackage ../development/python-modules/genpy { }; + cymem = callPackage ../development/python-modules/cymem { }; ftfy = callPackage ../development/python-modules/ftfy { }; @@ -5437,8 +5484,14 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + blis = callPackage ../development/python-modules/blis { }; + + srsly = callPackage ../development/python-modules/srsly { }; + thinc = callPackage ../development/python-modules/thinc { }; + wasabi = callPackage ../development/python-modules/wasabi { }; + yahooweather = callPackage ../development/python-modules/yahooweather { }; spacy = callPackage ../development/python-modules/spacy { }; @@ -5455,6 +5508,8 @@ in { textacy = callPackage ../development/python-modules/textacy { }; + tld = callPackage ../development/python-modules/tld { }; + tldextract = callPackage ../development/python-modules/tldextract { }; pyemd = callPackage ../development/python-modules/pyemd { }; |