diff options
336 files changed, 4493 insertions, 2439 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 20668760d2d..9835b765461 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,6 +12,7 @@ # GitHub actions /.github/workflows @Mic92 @zowoq +/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml new file mode 100644 index 00000000000..1aadef16328 --- /dev/null +++ b/.github/workflows/merge-staging.yml @@ -0,0 +1,39 @@ +name: "merge staging(-next)" + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '0 */6 * * *' + +jobs: + sync-branch: + if: github.repository == 'NixOS/nixpkgs' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Merge master into staging-next + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: staging-next + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Merge staging-next into staging + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: staging-next + target_branch: staging + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md new file mode 100644 index 00000000000..3829b3575bb --- /dev/null +++ b/doc/builders/packages/emacs.section.md @@ -0,0 +1,119 @@ +# Emacs {#sec-emacs} + +## Configuring Emacs + +The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` 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 `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: + +```nix +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} +``` + +You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` 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 `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts. + +```nix +{ + 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 + ])); + }; +} +``` + +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 `-q` to the Emacs command. + +Sometimes `emacsWithPackages` 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 `pkgs/top-level/emacs-packages.nix`). 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 `overrideScope'`. + +```nix +overrides = self: super: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages + (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante + ]) +``` diff --git a/doc/builders/packages/emacs.xml b/doc/builders/packages/emacs.xml deleted file mode 100644 index 9cce7c40863..00000000000 --- a/doc/builders/packages/emacs.xml +++ /dev/null @@ -1,131 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - 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; - ... -}; -((emacsPackagesGen 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> diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index 6d7537bb36d..c2e7ef9bf61 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -9,18 +9,18 @@ <xi:include href="dlib.xml" /> <xi:include href="eclipse.xml" /> <xi:include href="elm.xml" /> - <xi:include href="emacs.xml" /> + <xi:include href="emacs.section.xml" /> <xi:include href="firefox.section.xml" /> <xi:include href="ibus.xml" /> <xi:include href="kakoune.section.xml" /> - <xi:include href="linux.xml" /> + <xi:include href="linux.section.xml" /> <xi:include href="locales.xml" /> - <xi:include href="nginx.xml" /> - <xi:include href="opengl.xml" /> + <xi:include href="nginx.section.xml" /> + <xi:include href="opengl.section.xml" /> <xi:include href="shell-helpers.xml" /> <xi:include href="steam.xml" /> <xi:include href="cataclysm-dda.section.xml" /> <xi:include href="urxvt.xml" /> - <xi:include href="weechat.xml" /> - <xi:include href="xorg.xml" /> + <xi:include href="weechat.section.xml" /> + <xi:include href="xorg.section.xml" /> </chapter> diff --git a/doc/builders/packages/linux.section.md b/doc/builders/packages/linux.section.md new file mode 100644 index 00000000000..1b8d6eda749 --- /dev/null +++ b/doc/builders/packages/linux.section.md @@ -0,0 +1,41 @@ +# Linux kernel {#sec-linux-kernel} + +The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/kernel`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel). + +The function that builds the kernel has an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`). + +The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package: + +```nix +modulesTree = [kernel] + ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi + ++ ...; +``` + +How to add a new (major) version of the Linux kernel to Nixpkgs: + +1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it. + +2. Add the new kernel to `all-packages.nix` (e.g., create an attribute `kernel_2_6_22`). + +3. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following: + + 1. Make an copy from the old config (e.g. `config-2.6.21-i686-smp`) to the new one (e.g. `config-2.6.22-i686-smp`). + + 2. Copy the config file for this platform (e.g. `config-2.6.22-i686-smp`) to `.config` in the kernel source tree. + + 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on `i686` and disable it on `x86_64`). + + 4. If needed you can also run `make menuconfig`: + + ```ShellSession + $ nix-env -i ncurses + $ export NIX_CFLAGS_LINK=-lncurses + $ make menuconfig ARCH=arch + ``` + + 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`). + +4. Test building the kernel: `nix-build -A kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it. + +5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `all-packages.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. diff --git a/doc/builders/packages/linux.xml b/doc/builders/packages/linux.xml deleted file mode 100644 index 72d0e21493b..00000000000 --- a/doc/builders/packages/linux.xml +++ /dev/null @@ -1,85 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-linux-kernel"> - <title>Linux kernel</title> - - <para> - The Nix expressions to build the Linux kernel are in <link -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>. - </para> - - <para> - The function that builds the kernel has an argument <varname>kernelPatches</varname> which should be a list of <literal>{name, patch, extraConfig}</literal> attribute sets, where <varname>name</varname> is the name of the patch (which is included in the kernel’s <varname>meta.description</varname> attribute), <varname>patch</varname> is the patch itself (possibly compressed), and <varname>extraConfig</varname> (optional) is a string specifying extra options to be concatenated to the kernel configuration file (<filename>.config</filename>). - </para> - - <para> - The kernel derivation exports an attribute <varname>features</varname> specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external <varname>iwlwifi</varname> package: -<programlisting> -modulesTree = [kernel] - ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi - ++ ...; -</programlisting> - </para> - - <para> - How to add a new (major) version of the Linux kernel to Nixpkgs: - <orderedlist> - <listitem> - <para> - Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>) to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update it. - </para> - </listitem> - <listitem> - <para> - Add the new kernel to <filename>all-packages.nix</filename> (e.g., create an attribute <varname>kernel_2_6_22</varname>). - </para> - </listitem> - <listitem> - <para> - Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (<literal>i686</literal>, <literal>x86_64</literal>, <literal>uml</literal>) do the following: - <orderedlist> - <listitem> - <para> - Make an copy from the old config (e.g. <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g. <filename>config-2.6.22-i686-smp</filename>). - </para> - </listitem> - <listitem> - <para> - Copy the config file for this platform (e.g. <filename>config-2.6.22-i686-smp</filename>) to <filename>.config</filename> in the kernel source tree. - </para> - </listitem> - <listitem> - <para> - Run <literal>make oldconfig ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer all questions. (For the uml configuration, also add <literal>SHELL=bash</literal>.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on <literal>i686</literal> and disable it on <literal>x86_64</literal>). - </para> - </listitem> - <listitem> - <para> - If needed you can also run <literal>make menuconfig</literal>: -<screen> -<prompt>$ </prompt>nix-env -i ncurses -<prompt>$ </prompt>export NIX_CFLAGS_LINK=-lncurses -<prompt>$ </prompt>make menuconfig ARCH=<replaceable>arch</replaceable></screen> - </para> - </listitem> - <listitem> - <para> - Copy <filename>.config</filename> over the new config file (e.g. <filename>config-2.6.22-i686-smp</filename>). - </para> - </listitem> - </orderedlist> - </para> - </listitem> - <listitem> - <para> - Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>. If it compiles, ship it! For extra credit, try booting NixOS with it. - </para> - </listitem> - <listitem> - <para> - It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the <varname>linuxPackagesFor</varname> function in <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. - </para> - </listitem> - </orderedlist> - </para> -</section> diff --git a/doc/builders/packages/nginx.section.md b/doc/builders/packages/nginx.section.md new file mode 100644 index 00000000000..154c21f9b36 --- /dev/null +++ b/doc/builders/packages/nginx.section.md @@ -0,0 +1,11 @@ +# Nginx {#sec-nginx} + +[Nginx](https://nginx.org) is a reverse proxy and lightweight webserver. + +## ETags on static files served from the Nix store {#sec-nginx-etag} + +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 [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` 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). + +Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` 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 `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content. + +As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` 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. diff --git a/doc/builders/packages/nginx.xml b/doc/builders/packages/nginx.xml deleted file mode 100644 index 65854ba0236..00000000000 --- a/doc/builders/packages/nginx.xml +++ /dev/null @@ -1,25 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-nginx"> - <title>Nginx</title> - - <para> - <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and lightweight webserver. - </para> - - <section xml:id="sec-nginx-etag"> - <title>ETags on static files served from the Nix store</title> - - <para> - HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link> response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the <literal>Last-Modified</literal> header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility). - </para> - - <para> - Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link> response header. The value of the <literal>ETag</literal> header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an <literal>If-None-Match</literal> header. If the ETag value is unchanged, then the server does not need to resend the content. - </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/builders/packages/opengl.section.md b/doc/builders/packages/opengl.section.md new file mode 100644 index 00000000000..6866bf89221 --- /dev/null +++ b/doc/builders/packages/opengl.section.md @@ -0,0 +1,15 @@ +# OpenGL {#sec-opengl} + +OpenGL support varies depending on which hardware is used and which drivers are available and loaded. + +Broadly, we support both GL vendors: Mesa and NVIDIA. + +## NixOS Desktop + +The NixOS desktop or other non-headless configurations are the primary target for OpenGL libraries and applications. The current solution for discovering which drivers are available is based on [libglvnd](https://gitlab.freedesktop.org/glvnd/libglvnd). `libglvnd` performs "vendor-neutral dispatch", trying a variety of techniques to find the system's GL implementation. In practice, this will be either via standard GLX for X11 users or EGL for Wayland users, and supporting either NVIDIA or Mesa extensions. + +## Nix on GNU/Linux + +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 `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs. + +For proprietary video drivers you might have luck with also adding the corresponding video driver package. diff --git a/doc/builders/packages/opengl.xml b/doc/builders/packages/opengl.xml deleted file mode 100644 index dfd64b18858..00000000000 --- a/doc/builders/packages/opengl.xml +++ /dev/null @@ -1,9 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-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> diff --git a/doc/builders/packages/weechat.section.md b/doc/builders/packages/weechat.section.md new file mode 100644 index 00000000000..1d99b00e632 --- /dev/null +++ b/doc/builders/packages/weechat.section.md @@ -0,0 +1,85 @@ +# Weechat {#sec-weechat} + +Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as + +```nix +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ python perl ]; + } +} +``` + +If the `configure` function returns an attrset without the `plugins` attribute, `availablePlugins` will be used automatically. + +The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and `lua`. + +The python and perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute: + +```nix +weechat.override { configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ + (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) + ]; + }; +} +``` + +In order to also keep all default plugins installed, it is possible to use the following method: + +```nix +weechat.override { configure = { availablePlugins, ... }: { + plugins = builtins.attrValues (availablePlugins // { + python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); + }); +}; } +``` + +WeeChat allows to set defaults on startup using the `--run-command`. The `configure` method can be used to pass commands to the program: + +```nix +weechat.override { + configure = { availablePlugins, ... }: { + init = '' + /set foo bar + /server add freenode chat.freenode.org + ''; + }; +} +``` + +Further values can be added to the list of commands when running `weechat --run-command "your-commands"`. + +Additionally it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`: + +```nix +weechat.override { + configure = { availablePlugins, ... }: { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp weechat-matrix-bridge wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + '': + }; +} +``` + +In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in `$out/share`. An exemplary derivation looks like this: + +```nix +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "exemplary-weechat-script"; + src = fetchurl { + url = "https://scripts.tld/your-scripts.tar.gz"; + sha256 = "..."; + }; + passthru.scripts = [ "foo.py" "bar.lua" ]; + installPhase = '' + mkdir $out/share + cp foo.py $out/share + cp bar.lua $out/share + ''; +} +``` diff --git a/doc/builders/packages/weechat.xml b/doc/builders/packages/weechat.xml deleted file mode 100644 index a110d3f491c..00000000000 --- a/doc/builders/packages/weechat.xml +++ /dev/null @@ -1,85 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-weechat"> - <title>Weechat</title> - - <para> - Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as -<programlisting>weechat.override {configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ python perl ]; - } -}</programlisting> - If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal> attribute, <literal>availablePlugins</literal> will be used automatically. - </para> - - <para> - The plugins currently available are <literal>python</literal>, <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>, <literal>tcl</literal> and <literal>lua</literal>. - </para> - - <para> - The python and perl plugins allows the addition of extra libraries. For instance, the <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or libnotify, and the <literal>fish.py</literal> script requires pycrypto. To use these scripts, use the plugin's <literal>withPackages</literal> attribute: -<programlisting>weechat.override { configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ - (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) - ]; - }; -} -</programlisting> - </para> - - <para> - In order to also keep all default plugins installed, it is possible to use the following method: -<programlisting>weechat.override { configure = { availablePlugins, ... }: { - plugins = builtins.attrValues (availablePlugins // { - python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); - }); -}; } -</programlisting> - </para> - - <para> - WeeChat allows to set defaults on startup using the <literal>--run-command</literal>. The <literal>configure</literal> method can be used to pass commands to the program: -<programlisting>weechat.override { - configure = { availablePlugins, ... }: { - init = '' - /set foo bar - /server add freenode chat.freenode.org - ''; - }; -}</programlisting> - Further values can be added to the list of commands when running <literal>weechat --run-command "your-commands"</literal>. - </para> - - <para> - Additionally it's possible to specify scripts to be loaded when starting <literal>weechat</literal>. These will be loaded before the commands from <literal>init</literal>: -<programlisting>weechat.override { - configure = { availablePlugins, ... }: { - scripts = with pkgs.weechatScripts; [ - weechat-xmpp weechat-matrix-bridge wee-slack - ]; - init = '' - /set plugins.var.python.jabber.key "val" - '': - }; -}</programlisting> - </para> - - <para> - In <literal>nixpkgs</literal> there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a <literal>passthru.scripts</literal> attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in <literal>$out/share</literal>. An exemplary derivation looks like this: -<programlisting>{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "exemplary-weechat-script"; - src = fetchurl { - url = "https://scripts.tld/your-scripts.tar.gz"; - sha256 = "..."; - }; - passthru.scripts = [ "foo.py" "bar.lua" ]; - installPhase = '' - mkdir $out/share - cp foo.py $out/share - cp bar.lua $out/share - ''; -}</programlisting> - </para> -</section> diff --git a/doc/builders/packages/xorg.section.md b/doc/builders/packages/xorg.section.md new file mode 100644 index 00000000000..be220a25404 --- /dev/null +++ b/doc/builders/packages/xorg.section.md @@ -0,0 +1,34 @@ +# X.org {#sec-xorg} + +The Nix expressions for the X.org packages reside in `pkgs/servers/x11/xorg/default.nix`. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file `pkgs/servers/x11/xorg/overrides.nix`, in which you can override or add to the derivations produced by the generator. + +## Katamari Tarballs + +X.org upstream releases used to include [katamari](https://en.wiktionary.org/wiki/%E3%81%8B%E3%81%9F%E3%81%BE%E3%82%8A) releases, which included a holistic recommended version for each tarball, up until 7.7. To create a list of tarballs in a katamari release: + +```ShellSession +export release="X11R7.7" +export url="mirror://xorg/$release/src/everything/" +cat $(PRINT_PATH=1 nix-prefetch-url $url | tail -n 1) \ + | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'url'}$2\n"; }; }' \ + | sort > "tarballs-$release.list" +``` + +## Individual Tarballs + +The upstream release process for [X11R7.8](https://x.org/wiki/Releases/7.8/) does not include a planned katamari. Instead, each component of X.org is released as its own tarball. We maintain `pkgs/servers/x11/xorg/tarballs.list` as a list of tarballs for each individual package. This list includes X.org core libraries and protocol descriptions, extra newer X11 interface libraries, like `xorg.libxcb`, and classic utilities which are largely unused but still available if needed, like `xorg.imake`. + +## Generating Nix Expressions + +The generator is invoked as follows: + +```ShellSession +cd pkgs/servers/x11/xorg +<tarballs.list perl ./generate-expr-from-tarballs.pl +``` + +For each of the tarballs in the `.list` files, the script downloads it, unpacks it, and searches its `configure.ac` and `*.pc.in` files for dependencies. This information is used to generate `default.nix`. The generator caches downloaded tarballs between runs. Pay close attention to the `NOT FOUND: $NAME` messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) + +## Overriding the Generator + +If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, `patches` or a `postInstall` hook), you should modify `pkgs/servers/x11/xorg/overrides.nix`. diff --git a/doc/builders/packages/xorg.xml b/doc/builders/packages/xorg.xml deleted file mode 100644 index ebf4930cc09..00000000000 --- a/doc/builders/packages/xorg.xml +++ /dev/null @@ -1,34 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-xorg"> - <title>X.org</title> - - <para> - The Nix expressions for the X.org packages reside in <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can override or add to the derivations produced by the generator. - </para> - - <para> - The generator is invoked as follows: -<screen> -<prompt>$ </prompt>cd pkgs/servers/x11/xorg -<prompt>$ </prompt>cat tarballs-7.5.list extra.list old.list \ - | perl ./generate-expr-from-tarballs.pl -</screen> - For each of the tarballs in the <filename>.list</filename> files, the script downloads it, unpacks it, and searches its <filename>configure.ac</filename> and <filename>*.pc.in</filename> files for dependencies. This information is used to generate <filename>default.nix</filename>. The generator caches downloaded tarballs between runs. Pay close attention to the <literal>NOT FOUND: <replaceable>name</replaceable></literal> messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) - </para> - - <para> - A file like <filename>tarballs-7.5.list</filename> contains all tarballs in a X.org release. It can be generated like this: -<screen> -<prompt>$ </prompt>export i="mirror://xorg/X11R7.4/src/everything/" -<prompt>$ </prompt>cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ - | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ - | sort > tarballs-7.4.list -</screen> - <filename>extra.list</filename> contains libraries that aren’t part of X.org proper, but are closely related to it, such as <literal>libxcb</literal>. <filename>old.list</filename> contains some packages that were removed from X.org, but are still needed by some people or by other packages (such as <varname>imake</varname>). - </para> - - <para> - If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, <varname>patches</varname> or a <varname>postInstall</varname> hook), you should modify <filename>pkgs/servers/x11/xorg/overrides.nix</filename>. - </para> -</section> diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml index 96bf44da972..991db77bc58 100644 --- a/doc/contributing/reviewing-contributions.xml +++ b/doc/contributing/reviewing-contributions.xml @@ -467,12 +467,8 @@ It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. </para> - <para> - TODO: add the procedure to request merging rights. - </para> - <!-- -The following paragraph about how to deal with unactive contributors is just a +The following paragraphs about how to deal with unactive contributors is just a proposition and should be modified to what the community agrees to be the right policy. @@ -481,6 +477,10 @@ policy. --> <para> + Please see the discussion in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/50105">GitHub nixpkgs issue #50105</link> for information on how to proceed to be granted this level of access. + </para> + + <para> In a case a contributor definitively leaves the Nix community, they should create an issue or post on <link xlink:href="https://discourse.nixos.org">Discourse</link> with references of packages and modules they maintain so the maintainership can be taken over by other contributors. </para> diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md new file mode 100644 index 00000000000..714e84efc8d --- /dev/null +++ b/doc/languages-frameworks/coq.section.md @@ -0,0 +1,40 @@ +# Coq {#sec-language-coq} + +Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. + +Some extensions (plugins) might require OCaml and sometimes other OCaml packages. The `coq.ocamlPackages` attribute can be used to depend on the same package set Coq was built against. + +Coq libraries may be compatible with some specific versions of Coq only. The `compatibleCoqVersions` attribute is used to precisely select those versions of Coq that are compatible with this derivation. + +Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes `mathcomp` as `buildInputs`. Its `Makefile` has been generated using `coq_makefile` so we only have to set the `$COQLIB` variable at install time. + +```nix +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-multinomials-${version}"; + version = "1.0"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "multinomials"; + rev = version; + sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.cecill-b; + inherit (coq.meta) platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; +} +``` diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml deleted file mode 100644 index 86d9226166f..00000000000 --- a/doc/languages-frameworks/coq.xml +++ /dev/null @@ -1,52 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-language-coq"> - <title>Coq</title> - - <para> - Coq libraries should be installed in <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such directories are automatically added to the <literal>$COQPATH</literal> environment variable by the hook defined in the Coq derivation. - </para> - - <para> - Some extensions (plugins) might require OCaml and sometimes other OCaml packages. The <literal>coq.ocamlPackages</literal> attribute can be used to depend on the same package set Coq was built against. - </para> - - <para> - Coq libraries may be compatible with some specific versions of Coq only. The <literal>compatibleCoqVersions</literal> attribute is used to precisely select those versions of Coq that are compatible with this derivation. - </para> - - <para> - Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its <literal>Makefile</literal> has been generated using <literal>coq_makefile</literal> so we only have to set the <literal>$COQLIB</literal> variable at install time. - </para> - -<programlisting> -{ stdenv, fetchFromGitHub, coq, mathcomp }: - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-multinomials-${version}"; - version = "1.0"; - src = fetchFromGitHub { - owner = "math-comp"; - repo = "multinomials"; - rev = version; - sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = { - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - inherit (src.meta) homepage; - license = stdenv.lib.licenses.cecill-b; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; - }; -} -</programlisting> -</section> diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 22bc6e1baaa..5046ce00b9a 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -9,7 +9,7 @@ <xi:include href="android.section.xml" /> <xi:include href="beam.section.xml" /> <xi:include href="bower.xml" /> - <xi:include href="coq.xml" /> + <xi:include href="coq.section.xml" /> <xi:include href="crystal.section.xml" /> <xi:include href="emscripten.section.xml" /> <xi:include href="gnome.xml" /> @@ -17,7 +17,7 @@ <xi:include href="haskell.section.xml" /> <xi:include href="idris.section.xml" /> <xi:include href="ios.section.xml" /> - <xi:include href="java.xml" /> + <xi:include href="java.section.xml" /> <xi:include href="lua.section.xml" /> <xi:include href="maven.section.xml" /> <xi:include href="node.section.xml" /> @@ -29,7 +29,7 @@ <xi:include href="r.section.xml" /> <xi:include href="ruby.section.xml" /> <xi:include href="rust.section.xml" /> - <xi:include href="texlive.xml" /> + <xi:include href="texlive.section.xml" /> <xi:include href="titanium.section.xml" /> <xi:include href="vim.section.xml" /> </chapter> diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md new file mode 100644 index 00000000000..77919d43f74 --- /dev/null +++ b/doc/languages-frameworks/java.section.md @@ -0,0 +1,91 @@ +# Java {#sec-language-java} + +Ant-based Java packages are typically built from source as follows: + +```nix +stdenv.mkDerivation { + name = "..."; + src = fetchurl { ... }; + + nativeBuildInputs = [ jdk ant ]; + + buildPhase = "ant"; +} +``` + +Note that `jdk` is an alias for the OpenJDK (self-built where available, +or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs +(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`. + +JAR files that are intended to be used by other packages should be +installed in `$out/share/java`. JDKs have a stdenv setup hook that add +any JARs in the `share/java` directories of the build inputs to the +`CLASSPATH` environment variable. For instance, if the package `libfoo` +installs a JAR named `foo.jar` in its `share/java` directory, and +another package declares the attribute + +```nix +buildInputs = [ libfoo ]; +nativeBuildInputs = [ jdk ]; +``` + +then `CLASSPATH` will be set to +`/nix/store/...-libfoo/share/java/foo.jar`. + +Private JARs should be installed in a location like +`$out/share/package-name`. + +If your Java package provides a program, you need to generate a wrapper +script to run it using a JRE. You can use `makeWrapper` for this: + +```nix +nativeBuildInputs = [ makeWrapper ]; + +installPhase = '' + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/foo \ + --add-flags "-cp $out/share/java/foo.jar org.foo.Main" +''; +``` + +Since the introduction of the Java Platform Module System in Java 9, +Java distributions typically no longer ship with a general-purpose JRE: +instead, they allow generating a JRE with only the modules required for +your application(s). Because we can't predict what modules will be +needed on a general-purpose system, the default jre package is the full +JDK. When building a minimal system/image, you can override the +`modules` parameter on `jre_minimal` to build a JRE with only the +modules relevant for you: + +```nix +let + my_jre = pkgs.jre_minimal.override { + modules = [ + # The modules used by 'something' and 'other' combined: + "java.base" + "java.logging" + ]; + }; + something = (pkgs.something.override { jre = my_jre; }); + other = (pkgs.other.override { jre = my_jre; }); +in + ... +``` + +Note all JDKs passthru `home`, so if your application requires +environment variables like `JAVA_HOME` being set, that can be done in a +generic fashion with the `--set` argument of `makeWrapper`: + +```bash +--set JAVA_HOME ${jdk.home} +``` + +It is possible to use a different Java compiler than `javac` from the +OpenJDK. For instance, to use the GNU Java Compiler: + +```nix +nativeBuildInputs = [ gcj ant ]; +``` + +Here, Ant will automatically use `gij` (the GNU Java Runtime) instead of +the OpenJRE. diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml deleted file mode 100644 index 881d492b5bf..00000000000 --- a/doc/languages-frameworks/java.xml +++ /dev/null @@ -1,77 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-language-java"> - <title>Java</title> - - <para> - Ant-based Java packages are typically built from source as follows: -<programlisting> -stdenv.mkDerivation { - name = "..."; - src = fetchurl { ... }; - - nativeBuildInputs = [ jdk ant ]; - - buildPhase = "ant"; -} -</programlisting> - Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the (unfree) <literal>oraclejdk</literal>. - </para> - - <para> - JAR files that are intended to be used by other packages should be installed in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that add any JARs in the <filename>share/java</filename> directories of the build inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if the package <literal>libfoo</literal> installs a JAR named <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute -<programlisting> -buildInputs = [ libfoo ]; -nativeBuildInputs = [ jdk ]; -</programlisting> - then <envar>CLASSPATH</envar> will be set to <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>. - </para> - - <para> - Private JARs should be installed in a location like <filename>$out/share/<replaceable>package-name</replaceable></filename>. - </para> - - <para> - If your Java package provides a program, you need to generate a wrapper script to run it using a JRE. You can use <literal>makeWrapper</literal> for this: -<programlisting> -nativeBuildInputs = [ makeWrapper ]; - -installPhase = - '' - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/foo \ - --add-flags "-cp $out/share/java/foo.jar org.foo.Main" - ''; -</programlisting> -Since the introduction of the Java Platform Module System in Java 9, Java distributions typically no longer ship with a general-purpose JRE: instead, they allow generating a JRE with only the modules required for your application(s). Because we can't predict what modules will be needed on a general-purpose system, the default <package>jre</package> package is the full JDK. When building a minimal system/image, you can override the <literal>modules</literal> parameter on <literal>jre_minimal</literal> to build a JRE with only the modules relevant for you: -<programlisting> -let - my_jre = pkgs.jre_minimal.override { - modules = [ - # The modules used by 'something' and 'other' combined: - "java.base" - "java.logging" - ]; - }; - something = (pkgs.something.override { jre = my_jre; }); - other = (pkgs.other.override { jre = my_jre; }); -in - ... -</programlisting> - </para> - - <para> - Note all JDKs passthru <literal>home</literal>, so if your application requires environment variables like <envar>JAVA_HOME</envar> being set, that can be done in a generic fashion with the <literal>--set</literal> argument of <literal>makeWrapper</literal>: -<programlisting> ---set JAVA_HOME ${jdk.home} -</programlisting> - </para> - - <para> - It is possible to use a different Java compiler than <command>javac</command> from the OpenJDK. For instance, to use the GNU Java Compiler: -<programlisting> -nativeBuildInputs = [ gcj ant ]; -</programlisting> - Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE. - </para> -</section> diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md new file mode 100644 index 00000000000..9584c56bb52 --- /dev/null +++ b/doc/languages-frameworks/texlive.section.md @@ -0,0 +1,128 @@ + +# TeX Live {#sec-language-texlive} + +Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`. + +## User's guide {#sec-language-texlive-user-guide} + +- For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. +- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: + + ```nix + texlive.combine { + inherit (texlive) scheme-small collection-langkorean algorithms cm-super; + } + ``` + +- There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). +- By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add `pkgFilter` function to `combine`. + + ```nix + texlive.combine { + # inherit (texlive) whatever-you-want; + pkgFilter = pkg: + pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super"; + # elem tlType [ "run" "bin" "doc" "source" ] + # there are also other attributes: version, name + } + ``` + +- You can list packages e.g. by `nix repl`. + + ```ShellSession + $ nix repl + nix-repl> :l <nixpkgs> + nix-repl> texlive.collection-[TAB] + ``` + +- Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example `scheme-basic`, into the combination. + +## Custom packages {#sec-language-texlive-custom-packages} + + +You may find that you need to use an external TeX package. A derivation for such package has to provide contents of the "texmf" directory in its output and provide the `tlType` attribute. Here is a (very verbose) example: + +```nix +with import <nixpkgs> {}; + +let + foiltex_run = stdenvNoCC.mkDerivation { + pname = "latex-foiltex"; + version = "2.1.4b"; + passthru.tlType = "run"; + + srcs = [ + (fetchurl { + url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.dtx"; + sha256 = "07frz0krpz7kkcwlayrwrj2a2pixmv0icbngyw92srp9fp23cqpz"; + }) + (fetchurl { + url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.ins"; + sha256 = "09wkyidxk3n3zvqxfs61wlypmbhi1pxmjdi1kns9n2ky8ykbff99"; + }) + ]; + + unpackPhase = '' + runHook preUnpack + + for _src in $srcs; do + cp "$_src" $(stripHash "$_src") + done + + runHook postUnpack + ''; + + nativeBuildInputs = [ texlive.combined.scheme-small ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + # Generate the style files + latex foiltex.ins + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + path="$out/tex/latex/foiltex" + mkdir -p "$path" + cp *.{cls,def,clo} "$path/" + + runHook postInstall + ''; + + meta = with lib; { + description = "A LaTeX2e class for overhead transparencies"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.all; + }; + }; + foiltex = { pkgs = [ foiltex_run ]; }; + + latex_with_foiltex = texlive.combine { + inherit (texlive) scheme-small; + inherit foiltex; + }; +in + runCommand "test.pdf" { + nativeBuildInputs = [ latex_with_foiltex ]; + } '' +cat >test.tex <<EOF +\documentclass{foils} + +\title{Presentation title} +\date{} + +\begin{document} +\maketitle +\end{document} +EOF + pdflatex test.tex + cp test.pdf $out +'' +``` diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml deleted file mode 100644 index 141c46e5a62..00000000000 --- a/doc/languages-frameworks/texlive.xml +++ /dev/null @@ -1,152 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-language-texlive"> - <title>TeX Live</title> - - <para> - Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>. - </para> - - <section xml:id="sec-language-texlive-users-guide"> - <title>User's guide</title> - - <itemizedlist> - <listitem> - <para> - For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support. - </para> - </listitem> - <listitem> - <para> - It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: -<programlisting> -texlive.combine { - inherit (texlive) scheme-small collection-langkorean algorithms cm-super; -} -</programlisting> - There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). - </para> - </listitem> - <listitem> - <para> - By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>. -<programlisting> -texlive.combine { - # inherit (texlive) whatever-you-want; - pkgFilter = pkg: - pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super"; - # elem tlType [ "run" "bin" "doc" "source" ] - # there are also other attributes: version, name -} -</programlisting> - </para> - </listitem> - <listitem> - <para> - You can list packages e.g. by <command>nix repl</command>. -<programlisting> -<prompt>$ </prompt>nix repl -<prompt>nix-repl> </prompt>:l <nixpkgs> -<prompt>nix-repl> </prompt>texlive.collection-<keycap function="tab" /> -</programlisting> - </para> - </listitem> - <listitem> - <para> - Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example <varname>scheme-basic</varname>, into the combination. - </para> - </listitem> - </itemizedlist> - </section> - - <section xml:id="sec-language-texlive-custom-packages"> - <title>Custom packages</title> - <para> - You may find that you need to use an external TeX package. A derivation for such package has to provide contents of the "texmf" directory in its output and provide the <varname>tlType</varname> attribute. Here is a (very verbose) example: -<programlisting><![CDATA[ -with import <nixpkgs> {}; - -let - foiltex_run = stdenvNoCC.mkDerivation { - pname = "latex-foiltex"; - version = "2.1.4b"; - passthru.tlType = "run"; - - srcs = [ - (fetchurl { - url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.dtx"; - sha256 = "07frz0krpz7kkcwlayrwrj2a2pixmv0icbngyw92srp9fp23cqpz"; - }) - (fetchurl { - url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.ins"; - sha256 = "09wkyidxk3n3zvqxfs61wlypmbhi1pxmjdi1kns9n2ky8ykbff99"; - }) - ]; - - unpackPhase = '' - runHook preUnpack - - for _src in $srcs; do - cp "$_src" $(stripHash "$_src") - done - - runHook postUnpack - ''; - - nativeBuildInputs = [ texlive.combined.scheme-small ]; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - - # Generate the style files - latex foiltex.ins - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - path="$out/tex/latex/foiltex" - mkdir -p "$path" - cp *.{cls,def,clo} "$path/" - - runHook postInstall - ''; - - meta = with lib; { - description = "A LaTeX2e class for overhead transparencies"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.all; - }; - }; - foiltex = { pkgs = [ foiltex_run ]; }; - - latex_with_foiltex = texlive.combine { - inherit (texlive) scheme-small; - inherit foiltex; - }; -in - runCommand "test.pdf" { - nativeBuildInputs = [ latex_with_foiltex ]; - } '' -cat >test.tex <<EOF -\documentclass{foils} - -\title{Presentation title} -\date{} - -\begin{document} -\maketitle -\end{document} -EOF - pdflatex test.tex - cp test.pdf $out -'' -]]></programlisting> - </para> - </section> -</section> diff --git a/lib/modules.nix b/lib/modules.nix index d2d35dbaae5..3f2bfd478b0 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -265,7 +265,7 @@ rec { if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute." else - { _file = m._file or file; + { _file = toString m._file or file; key = toString m.key or key; disabledModules = m.disabledModules or []; imports = m.imports or []; @@ -273,7 +273,7 @@ rec { config = addFreeformType (addMeta (m.config or {})); } else - { _file = m._file or file; + { _file = toString m._file or file; key = toString m.key or key; disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 9939743157e..f6832945a23 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -25,7 +25,7 @@ rec { system = parse.doubleFromSystem final.parsed; config = parse.tripleFromSystem final.parsed; # Just a guess, based on `system` - platform = platforms.selectBySystem final.system; + platform = platforms.select final; # Determine whether we are compatible with the provided CPU isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu; # Derived meta-data diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 3bbe61ed33a..16002450f2d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -7,7 +7,7 @@ let riscv = bits: { config = "riscv${bits}-unknown-linux-gnu"; - platform = platforms.riscv-multiplatform bits; + platform = platforms.riscv-multiplatform; }; in @@ -39,6 +39,11 @@ rec { platform = platforms.zero-gravitas; }; + remarkable2 = { + config = "armv7l-unknown-linux-gnueabihf"; + platform = platforms.zero-sugar; + }; + armv7l-hf-multiplatform = { config = "armv7l-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; @@ -105,13 +110,13 @@ rec { riscv64-embedded = { config = "riscv64-none-elf"; libc = "newlib"; - platform = platforms.riscv-multiplatform "64"; + platform = platforms.riscv-multiplatform; }; riscv32-embedded = { config = "riscv32-none-elf"; libc = "newlib"; - platform = platforms.riscv-multiplatform "32"; + platform = platforms.riscv-multiplatform; }; mmix = { diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 42d9809fd7d..a0dccc85988 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -217,6 +217,21 @@ rec { }; }; + zero-sugar = { + name = "zero-sugar"; + kernelBaseConfig = "zero-sugar_defconfig"; + kernelArch = "arm"; + kernelDTB = true; + kernelAutoModules = false; + kernelPreferBuiltin = true; + kernelTarget = "zImage"; + gcc = { + cpu = "cortex-a7"; + fpu = "neon-vfpv4"; + float-abi = "hard"; + }; + }; + scaleway-c1 = armv7l-hf-multiplatform // { gcc = { cpu = "cortex-a9"; @@ -456,10 +471,9 @@ rec { ## Other ## - riscv-multiplatform = bits: { + riscv-multiplatform = { name = "riscv-multiplatform"; kernelArch = "riscv"; - bfdEmulation = "elf${bits}lriscv"; kernelTarget = "vmlinux"; kernelAutoModules = true; kernelBaseConfig = "defconfig"; @@ -469,17 +483,22 @@ rec { ''; }; - selectBySystem = system: { - i486-linux = pc32; - i586-linux = pc32; - i686-linux = pc32; - x86_64-linux = pc64; - armv5tel-linux = sheevaplug; - armv6l-linux = raspberrypi; - armv7a-linux = armv7l-hf-multiplatform; - armv7l-linux = armv7l-hf-multiplatform; - aarch64-linux = aarch64-multiplatform; - mipsel-linux = fuloong2f_n32; - powerpc64le-linux = powernv; - }.${system} or pcBase; + select = platform: + # x86 + /**/ if platform.isx86_32 then pc32 + else if platform.isx86_64 then pc64 + + # ARM + else if platform.isAarch32 then let + version = platform.parsed.cpu.version or ""; + in if lib.versionOlder version "6" then sheevaplug + else if lib.versionOlder version "7" then raspberrypi + else armv7l-hf-multiplatform + else if platform.isAarch64 then aarch64-multiplatform + + else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32 + + else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv + + else pcBase; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1967e7bee86..54a97f2b7a3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2755,6 +2755,16 @@ email = "adam.copp@gmail.com"; name = "Adam Copp"; }; + ethancedwards8 = { + email = "ethancarteredwards@gmail.com"; + github = "ethancedwards8"; + githubId = 60861925; + name = "Ethan Carter Edwards"; + keys = [{ + longkeyid = "rsa4096/0xF93DDAFA26EF2458"; + fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; + }]; + }; ethercrow = { email = "ethercrow@gmail.com"; github = "ethercrow"; @@ -3437,6 +3447,12 @@ fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; }]; }; + happysalada = { + email = "raphael@megzari.com"; + github = "happysalada"; + githubId = 5317234; + name = "Raphael Megzari"; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; @@ -4807,6 +4823,12 @@ githubId = 2422454; name = "Kai Wohlfahrt"; }; + kyleondy = { + email = "kyle@ondy.org"; + github = "kyleondy"; + githubId = 1640900; + name = "Kyle Ondy"; + }; kylesferrazza = { name = "Kyle Sferrazza"; email = "kyle.sferrazza@gmail.com"; @@ -6213,6 +6235,16 @@ githubId = 1916245; name = "Fernando Jose Pando"; }; + nasirhm = { + email = "nasirhussainm14@gmail.com"; + github = "nasirhm"; + githubId = 35005234; + name = "Nasir Hussain"; + keys = [{ + longkeyid = "rsa4096/0xD8126E559CE7C35D"; + fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; + }]; + }; Nate-Devv = { email = "natedevv@gmail.com"; name = "Nathan Moore"; @@ -6759,6 +6791,12 @@ githubId = 8641; name = "Pierre Carrier"; }; + pengmeiyu = { + email = "pengmyu@gmail.com"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 6df1d830348..bedeb7ccfa8 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -480,13 +480,8 @@ Retype new UNIX password: ***</screen> <prompt>$ </prompt>passwd eelco</screen> </para> <para> - You may also want to install some software. For instance, -<screen> -<prompt>$ </prompt>nix-env -qaP \*</screen> - shows what packages are available, and -<screen> -<prompt>$ </prompt>nix-env -f '<nixpkgs>' -iA w3m</screen> - installs the <literal>w3m</literal> browser. + You may also want to install some software. This will be covered + in <xref linkend="sec-package-management" />. </para> </listitem> </orderedlist> diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index ca24954db0c..96061e9ca59 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -244,6 +244,14 @@ </para> </warning> </listitem> + <listitem> + <para> + The <literal>rspamd</literal> services is now sandboxed. It is run as + a dynamic user instead of root, so secrets and other files may have to + be moved or their permissions may have to be fixed. The sockets are now + located in <literal>/run/rspamd</literal> instead of <literal>/run</literal>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index d9799aa69c9..c8c5a46dfb8 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -223,9 +223,10 @@ in # Figure out device names for the boot device and root filesystem. rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /) bootDevice=$(lsblk -npo PKNAME $rootPart) + partNum=$(lsblk -npo MAJ:MIN $rootPart | awk -F: '{print $2}') # Resize the root partition and the filesystem to fit the disk - echo ",+," | sfdisk -N2 --no-reread $bootDevice + echo ",+," | sfdisk -N$partNum --no-reread $bootDevice ${pkgs.parted}/bin/partprobe ${pkgs.e2fsprogs}/bin/resize2fs $rootPart diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f5e6c5f4d61..df8e5e1dd69 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -397,6 +397,7 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/logging/vector.nix ./services/mail/clamsmtp.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index 1a98f005602..cbf13f027de 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -61,10 +61,8 @@ in { Restart = "always"; ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}''; - User = "nobody"; - Group = "nogroup"; + DynamicUser = true; - PrivateTmp = true; ProtectHome = true; RuntimeDirectory = "hoogle"; diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index b344dfc2061..03070a8f9e7 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -148,7 +148,7 @@ in # saned needs to distinguish between IPv4 and IPv6 to open matching data sockets. BindIPv6Only = "ipv6-only"; Accept = true; - MaxConnections = 1; + MaxConnections = 64; }; }; diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix new file mode 100644 index 00000000000..a7c54ad75fd --- /dev/null +++ b/nixos/modules/services/logging/vector.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; +let cfg = config.services.vector; + +in { + options.services.vector = { + enable = mkEnableOption "Vector"; + + journaldAccess = mkOption { + type = types.bool; + default = false; + description = '' + Enable Vector to access journald. + ''; + }; + + settings = mkOption { + type = (pkgs.formats.json { }).type; + default = { }; + description = '' + Specify the configuration for Vector in Nix. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.groups.vector = { }; + users.users.vector = { + description = "Vector service user"; + group = "vector"; + isSystemUser = true; + }; + systemd.services.vector = { + description = "Vector event and log aggregator"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + serviceConfig = let + format = pkgs.formats.toml { }; + conf = format.generate "vector.toml" cfg.settings; + validateConfig = file: + pkgs.runCommand "validate-vector-conf" { } '' + ${pkgs.vector}/bin/vector validate --no-topology --no-environment "${file}" + ln -s "${file}" "$out" + ''; + in { + ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; + User = "vector"; + Group = "vector"; + Restart = "no"; + StateDirectory = "vector"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + # This group is required for accessing journald. + SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal"; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index a6c19a2af73..2f9d28195bd 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -371,6 +371,9 @@ in }; services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config; + systemd.services.postfix.serviceConfig.SupplementaryGroups = + mkIf cfg.postfix.enable [ postfixCfg.group ]; + # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; @@ -394,16 +397,45 @@ in restartTriggers = [ rspamdDir ]; serviceConfig = { - ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c /etc/rspamd/rspamd.conf -f"; + ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f"; Restart = "always"; + + User = "${cfg.user}"; + Group = "${cfg.group}"; + SupplementaryGroups = mkIf cfg.postfix.enable [ postfixCfg.group ]; + RuntimeDirectory = "rspamd"; + RuntimeDirectoryMode = "0755"; + StateDirectory = "rspamd"; + StateDirectoryMode = "0700"; + + AmbientCapabilities = []; + CapabilityBoundingSet = []; + DevicePolicy = "closed"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; PrivateTmp = true; + # we need to chown socket to rspamd-milter + PrivateUsers = !cfg.postfix.enable; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "0077"; }; - - preStart = '' - ${pkgs.coreutils}/bin/mkdir -p /var/lib/rspamd - ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd - ''; }; }; imports = [ diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 21ae9eb8b6d..45eb500fe8c 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -9,7 +9,14 @@ with lib; let cfg = config.networking.nat; - dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}"; + mkDest = externalIP: if externalIP == null + then "-j MASQUERADE" + else "-j SNAT --to-source ${externalIP}"; + dest = mkDest cfg.externalIP; + destIPv6 = mkDest cfg.externalIPv6; + + # Whether given IP (plus optional port) is an IPv6. + isIPv6 = ip: builtins.length (lib.splitString ":" ip) > 2; helpers = import ./helpers.nix { inherit config lib; }; @@ -28,63 +35,80 @@ let ${cfg.extraStopCommands} ''; - setupNat = '' - ${helpers} - # Create subchain where we store rules - ip46tables -w -t nat -N nixos-nat-pre - ip46tables -w -t nat -N nixos-nat-post - ip46tables -w -t nat -N nixos-nat-out - + mkSetupNat = { iptables, dest, internalIPs, forwardPorts }: '' # We can't match on incoming interface in POSTROUTING, so # mark packets coming from the internal interfaces. ${concatMapStrings (iface: '' - iptables -w -t nat -A nixos-nat-pre \ + ${iptables} -w -t nat -A nixos-nat-pre \ -i '${iface}' -j MARK --set-mark 1 '') cfg.internalInterfaces} # NAT the marked packets. ${optionalString (cfg.internalInterfaces != []) '' - iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \ + ${iptables} -w -t nat -A nixos-nat-post -m mark --mark 1 \ ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} ''} # NAT packets coming from the internal IPs. ${concatMapStrings (range: '' - iptables -w -t nat -A nixos-nat-post \ + ${iptables} -w -t nat -A nixos-nat-post \ -s '${range}' ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} - '') cfg.internalIPs} + '') internalIPs} # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' - iptables -w -t nat -A nixos-nat-pre \ + ${iptables} -w -t nat -A nixos-nat-pre \ -i ${toString cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} ${concatMapStrings (loopbackip: let - m = builtins.match "([0-9.]+):([0-9-]+)" fwd.destination; - destinationIP = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0; - destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else builtins.replaceStrings ["-"] [":"] (elemAt m 1); + matchIP = if isIPv6 fwd.destination then "[[]([0-9a-fA-F:]+)[]]" else "([0-9.]+)"; + m = builtins.match "${matchIP}:([0-9-]+)" fwd.destination; + destinationIP = if m == null then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0; + destinationPorts = if m == null then throw "bad ip:ports `${fwd.destination}'" else builtins.replaceStrings ["-"] [":"] (elemAt m 1); in '' # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself - iptables -w -t nat -A nixos-nat-out \ + ${iptables} -w -t nat -A nixos-nat-out \ -d ${loopbackip} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from other hosts behind NAT - iptables -w -t nat -A nixos-nat-pre \ + ${iptables} -w -t nat -A nixos-nat-pre \ -d ${loopbackip} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} - iptables -w -t nat -A nixos-nat-post \ + ${iptables} -w -t nat -A nixos-nat-post \ -d ${destinationIP} -p ${fwd.proto} \ --dport ${destinationPorts} \ -j SNAT --to-source ${loopbackip} '') fwd.loopbackIPs} - '') cfg.forwardPorts} + '') forwardPorts} + ''; + + setupNat = '' + ${helpers} + # Create subchains where we store rules + ip46tables -w -t nat -N nixos-nat-pre + ip46tables -w -t nat -N nixos-nat-post + ip46tables -w -t nat -N nixos-nat-out + + ${mkSetupNat { + iptables = "iptables"; + inherit dest; + inherit (cfg) internalIPs; + forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; + }} + + ${optionalString cfg.enableIPv6 (mkSetupNat { + iptables = "ip6tables"; + dest = destIPv6; + internalIPs = cfg.internalIPv6s; + forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; + })} ${optionalString (cfg.dmzHost != null) '' iptables -w -t nat -A nixos-nat-pre \ @@ -117,6 +141,15 @@ in ''; }; + networking.nat.enableIPv6 = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable IPv6 NAT. + ''; + }; + networking.nat.internalInterfaces = mkOption { type = types.listOf types.str; default = []; @@ -141,6 +174,18 @@ in ''; }; + networking.nat.internalIPv6s = mkOption { + type = types.listOf types.str; + default = []; + example = [ "fc00::/64" ]; + description = + '' + The IPv6 address ranges for which to perform NAT. Packets + coming from these addresses (on any interface) and destined + for the external interface will be rewritten. + ''; + }; + networking.nat.externalInterface = mkOption { type = types.nullOr types.str; default = null; @@ -164,6 +209,19 @@ in ''; }; + networking.nat.externalIPv6 = mkOption { + type = types.nullOr types.str; + default = null; + example = "2001:dc0:2001:11::175"; + description = + '' + The public IPv6 address to which packets from the local + network are to be rewritten. If this is left empty, the + IP address associated with the external interface will be + used. + ''; + }; + networking.nat.forwardPorts = mkOption { type = with types; listOf (submodule { options = { @@ -176,7 +234,7 @@ in destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward connection to destination ip:port; to specify a port range, use ip:start-end"; + description = "Forward connection to destination ip:port (or [ipv6]:port); to specify a port range, use ip:start-end"; }; proto = mkOption { @@ -195,11 +253,15 @@ in }; }); default = []; - example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ]; + example = [ + { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } + { sourcePort = 8080; destination = "[fc00::2]:80"; proto = "tcp"; } + ]; description = '' List of forwarded ports from the external interface to - internal destinations by using DNAT. + internal destinations by using DNAT. Destination can be + IPv6 if IPv6 NAT is enabled. ''; }; @@ -246,6 +308,9 @@ in (mkIf config.networking.nat.enable { assertions = [ + { assertion = cfg.enableIPv6 -> config.networking.enableIPv6; + message = "networking.nat.enableIPv6 requires networking.enableIPv6"; + } { assertion = (cfg.dmzHost != null) -> (cfg.externalInterface != null); message = "networking.nat.dmzHost requires networking.nat.externalInterface"; } @@ -261,6 +326,15 @@ in kernel.sysctl = { "net.ipv4.conf.all.forwarding" = mkOverride 99 true; "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + } // optionalAttrs cfg.enableIPv6 { + # Do not prevent IPv6 autoconfiguration. + # See <http://strugglers.net/~andy/blog/2011/09/04/linux-ipv6-router-advertisements-and-forwarding/>. + "net.ipv6.conf.all.accept_ra" = mkOverride 99 2; + "net.ipv6.conf.default.accept_ra" = mkOverride 99 2; + + # Forward IPv6 packets. + "net.ipv6.conf.all.forwarding" = mkOverride 99 true; + "net.ipv6.conf.default.forwarding" = mkOverride 99 true; }; }; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index d6684d69e61..1a1474595be 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -14,11 +14,18 @@ in { default = 41641; description = "The port to listen on for tunnel traffic (0=autoselect)."; }; + + package = mkOption { + type = types.package; + default = pkgs.tailscale; + defaultText = "pkgs.tailscale"; + description = "The package to use for tailscale"; + }; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.tailscale ]; # for the CLI - systemd.packages = [ pkgs.tailscale ]; + environment.systemPackages = [ cfg.package ]; # for the CLI + systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; serviceConfig.Environment = "PORT=${toString cfg.port}"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d746105ea64..2e79a214569 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -40,18 +40,18 @@ in bittorrent = handleTest ./bittorrent.nix {}; bitwarden = handleTest ./bitwarden.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; - buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; buildbot = handleTest ./buildbot.nix {}; + buildkite-agents = handleTest ./buildkite-agents.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTest ./cage.nix {}; cagebreak = handleTest ./cagebreak.nix {}; cassandra = handleTest ./cassandra.nix {}; - ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; + ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; @@ -59,9 +59,9 @@ in cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; + cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; codimd = handleTest ./codimd.nix {}; consul = handleTest ./consul.nix {}; - cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {}; containers-ephemeral = handleTest ./containers-ephemeral.nix {}; @@ -85,7 +85,6 @@ in dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; - oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-registry = handleTest ./docker-registry.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; @@ -119,24 +118,23 @@ in fsck = handleTest ./fsck.nix {}; ft2-clone = handleTest ./ft2-clone.nix {}; gerrit = handleTest ./gerrit.nix {}; - gotify-server = handleTest ./gotify-server.nix {}; - grocy = handleTest ./grocy.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; glusterfs = handleTest ./glusterfs.nix {}; - gnome3-xorg = handleTest ./gnome3-xorg.nix {}; gnome3 = handleTest ./gnome3.nix {}; - installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); + gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + go-neb = handleTest ./go-neb.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; - go-neb = handleTest ./go-neb.nix {}; google-oslogin = handleTest ./google-oslogin {}; + gotify-server = handleTest ./gotify-server.nix {}; grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; graylog = handleTest ./graylog.nix {}; + grocy = handleTest ./grocy.nix {}; grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; @@ -144,6 +142,8 @@ in handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; + installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); + oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. @@ -160,8 +160,8 @@ in ihatemoney = handleTest ./ihatemoney.nix {}; incron = handleTest ./incron.nix {}; influxdb = handleTest ./influxdb.nix {}; - initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrd-network-openvpn = handleTest ./initrd-network-openvpn {}; + initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; iodine = handleTest ./iodine.nix {}; @@ -201,8 +201,8 @@ in lxd-nftables = handleTest ./lxd-nftables.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; - magnetico = handleTest ./magnetico.nix {}; magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; + magnetico = handleTest ./magnetico.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; @@ -213,9 +213,9 @@ in metabase = handleTest ./metabase.nix {}; minecraft = handleTest ./minecraft.nix {}; minecraft-server = handleTest ./minecraft-server.nix {}; + minidlna = handleTest ./minidlna.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; - minidlna = handleTest ./minidlna.nix {}; misc = handleTest ./misc.nix {}; moinmoin = handleTest ./moinmoin.nix {}; mongodb = handleTest ./mongodb.nix {}; @@ -240,10 +240,10 @@ in ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; neo4j = handleTest ./neo4j.nix {}; - specialisation = handleTest ./specialisation.nix {}; netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; + specialisation = handleTest ./specialisation.nix {}; # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; nextcloud = handleTest ./nextcloud {}; @@ -269,8 +269,8 @@ in openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; openssh = handleTest ./openssh.nix {}; - openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; + openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; osrm-backend = handleTest ./osrm-backend.nix {}; @@ -280,6 +280,7 @@ in pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; paperless = handleTest ./paperless.nix {}; + pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; @@ -339,9 +340,9 @@ in snapper = handleTest ./snapper.nix {}; sogo = handleTest ./sogo.nix {}; solr = handleTest ./solr.nix {}; + sonarr = handleTest ./sonarr.nix {}; spacecookie = handleTest ./spacecookie.nix {}; spike = handleTest ./spike.nix {}; - sonarr = handleTest ./sonarr.nix {}; sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; @@ -358,13 +359,12 @@ in systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; - systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; - systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {}; + systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; - pdns-recursor = handleTest ./pdns-recursor.nix {}; + systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; @@ -372,20 +372,22 @@ in tinydns = handleTest ./tinydns.nix {}; tor = handleTest ./tor.nix {}; # traefik test relies on docker-containers + trac = handleTest ./trac.nix {}; traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; transmission = handleTest ./transmission.nix {}; - trac = handleTest ./trac.nix {}; - trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; + trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; tuptime = handleTest ./tuptime.nix {}; - unbound = handleTest ./unbound.nix {}; + ucg = handleTest ./ucg.nix {}; udisks2 = handleTest ./udisks2.nix {}; + unbound = handleTest ./unbound.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; + vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 8e0e82d64cc..3d1e39a379c 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -117,7 +117,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) docker.wait_until_succeeds("curl -f http://localhost:8000/") docker.succeed( - "docker rm --force nginx", "docker rmi '${examples.nginx.imageName}'", + "docker rm --force nginx", + "docker rmi '${examples.nginx.imageName}'", ) with subtest("A pulled image can be used as base image"): diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index aaed2486421..1fb27593f05 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -14,6 +14,7 @@ let nodes = { server = { config, pkgs, ... }: { + virtualisation.memorySize = 2048; services.gitea = { enable = true; database = { inherit type; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index ae150553273..40661cdca0a 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -88,8 +88,8 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { with subtest("whether kernel.poweroff_cmd is set"): machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') - with subtest("whether the blkio controller is properly enabled"): - machine.succeed("[ -e /sys/fs/cgroup/blkio/blkio.reset_stats ]") + with subtest("whether the io cgroupv2 controller is properly enabled"): + machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") with subtest("whether we have a reboot record in wtmp"): machine.shutdown diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index bccd2de7c9b..dd28563dc4c 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -61,6 +61,12 @@ import ./make-test-python.nix ( podman.succeed("podman stop sleeping") podman.succeed("podman rm sleeping") + + podman.succeed( + "mkdir -p /tmp/podman-run-1000/libpod && chown alice -R /tmp/podman-run-1000" + ) + + with subtest("Run container rootless with crun"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 6eaa02ef429..7f41e1a7956 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -13,10 +13,12 @@ let machine.succeed("id rspamd >/dev/null") ''; checkSocket = socket: user: group: mode: '' - machine.succeed("ls ${socket} >/dev/null") - machine.succeed('[[ "$(stat -c %U ${socket})" == "${user}" ]]') - machine.succeed('[[ "$(stat -c %G ${socket})" == "${group}" ]]') - machine.succeed('[[ "$(stat -c %a ${socket})" == "${mode}" ]]') + machine.succeed( + "ls ${socket} >/dev/null", + '[[ "$(stat -c %U ${socket})" == "${user}" ]]', + '[[ "$(stat -c %G ${socket})" == "${group}" ]]', + '[[ "$(stat -c %a ${socket})" == "${mode}" ]]', + ) ''; simple = name: enableIPv6: makeTest { name = "rspamd-${name}"; @@ -54,33 +56,35 @@ in services.rspamd = { enable = true; workers.normal.bindSockets = [{ - socket = "/run/rspamd.sock"; + socket = "/run/rspamd/rspamd.sock"; mode = "0600"; - owner = "root"; - group = "root"; + owner = "rspamd"; + group = "rspamd"; }]; workers.controller.bindSockets = [{ - socket = "/run/rspamd-worker.sock"; + socket = "/run/rspamd/rspamd-worker.sock"; mode = "0666"; - owner = "root"; - group = "root"; + owner = "rspamd"; + group = "rspamd"; }]; }; }; testScript = '' ${initMachine} - machine.wait_for_file("/run/rspamd.sock") - ${checkSocket "/run/rspamd.sock" "root" "root" "600" } - ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + machine.wait_for_file("/run/rspamd/rspamd.sock") + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "600" } + ${checkSocket "/run/rspamd/rspamd-worker.sock" "rspamd" "rspamd" "666" } machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf")) machine.log( machine.succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf") ) machine.log(machine.succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf")) - machine.log(machine.succeed("rspamc -h /run/rspamd-worker.sock stat")) + machine.log(machine.succeed("rspamc -h /run/rspamd/rspamd-worker.sock stat")) machine.log( - machine.succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping") + machine.succeed( + "curl --unix-socket /run/rspamd/rspamd-worker.sock http://localhost/ping" + ) ) ''; }; @@ -91,16 +95,16 @@ in services.rspamd = { enable = true; workers.normal.bindSockets = [{ - socket = "/run/rspamd.sock"; + socket = "/run/rspamd/rspamd.sock"; mode = "0600"; - owner = "root"; - group = "root"; + owner = "rspamd"; + group = "rspamd"; }]; workers.controller.bindSockets = [{ - socket = "/run/rspamd-worker.sock"; + socket = "/run/rspamd/rspamd-worker.sock"; mode = "0666"; - owner = "root"; - group = "root"; + owner = "rspamd"; + group = "rspamd"; }]; workers.controller2 = { type = "controller"; @@ -116,9 +120,9 @@ in testScript = '' ${initMachine} - machine.wait_for_file("/run/rspamd.sock") - ${checkSocket "/run/rspamd.sock" "root" "root" "600" } - ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + machine.wait_for_file("/run/rspamd/rspamd.sock") + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "600" } + ${checkSocket "/run/rspamd/rspamd-worker.sock" "rspamd" "rspamd" "666" } machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf")) machine.log( machine.succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf") @@ -137,9 +141,11 @@ in machine.wait_until_succeeds( "journalctl -u rspamd | grep -i 'starting controller process' >&2" ) - machine.log(machine.succeed("rspamc -h /run/rspamd-worker.sock stat")) + machine.log(machine.succeed("rspamc -h /run/rspamd/rspamd-worker.sock stat")) machine.log( - machine.succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping") + machine.succeed( + "curl --unix-socket /run/rspamd/rspamd-worker.sock http://localhost/ping" + ) ) machine.log(machine.succeed("curl http://localhost:11335/ping")) ''; diff --git a/nixos/tests/ucg.nix b/nixos/tests/ucg.nix new file mode 100644 index 00000000000..47507aee07c --- /dev/null +++ b/nixos/tests/ucg.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "ucg"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ AndersonTorres ]; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.ucg ]; + }; + + testScript = '' + machine.succeed("echo 'Lorem ipsum dolor sit amet\n2.7182818284590' > /tmp/foo") + assert "dolor" in machine.succeed("ucg 'dolor' /tmp/foo") + assert "Lorem" in machine.succeed("ucg --ignore-case 'lorem' /tmp/foo") + machine.fail("ucg --word-regexp '2718' /tmp/foo") + machine.fail("ucg 'pisum' /tmp/foo") + ''; +}) diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix new file mode 100644 index 00000000000..e96c3ad152f --- /dev/null +++ b/nixos/tests/vector.nix @@ -0,0 +1,37 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +{ + test1 = makeTest { + name = "vector-test1"; + meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ]; + + machine = { config, pkgs, ... }: { + services.vector = { + enable = true; + journaldAccess = true; + settings = { + sources.journald.type = "journald"; + + sinks = { + file = { + type = "file"; + inputs = [ "journald" ]; + path = "/var/lib/vector/logs.log"; + encoding = { codec = "ndjson"; }; + }; + }; + }; + }; + }; + + # ensure vector is forwarding the messages appropriately + testScript = '' + machine.wait_for_unit("vector.service") + machine.succeed("test -f /var/lib/vector/logs.log") + ''; + }; +} diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 9b1a1869c28..2fb453cf19c 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, unstableGitUpdater , SDL , jack2 , Foundation @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { description = "A music tracker similar to lsdj optimised to run on portable game consoles"; longDescription = '' diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 91bf47dddd6..4d1387bf633 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.3"; + version = "0.5.4"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77"; + sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index e4898baca54..d6ce864d652 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.5"; + version = "42.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k"; + sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z"; }; patches = [ diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index eec39e691a8..3958a44cdaf 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,19 +15,17 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.5"; + version = "1.0.5.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; }; - nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; - # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. - # Build with `dotnet build` instead and add a custom `dotnet run` script. buildPhase = '' export HOME=$TMP/home export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -37,21 +35,15 @@ stdenv.mkDerivation rec { nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj - dotnet build -c Release BTCPayServer/BTCPayServer.csproj - ''; - - runScript = '' - #!${bash}/bin/bash - DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ - -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj ''; + # btcpayserver requires the publish directory as its working dir + # https://github.com/btcpayserver/btcpayserver/issues/1894 installPhase = '' - cd .. - share=$out/share/$pname - mkdir -p $share - mv -T source $share - install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + makeWrapper $out/share/$pname/BTCPayServer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" \ + --run "cd $out/share/$pname" ''; dontStrip = true; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index cb0641b8c85..5ee5e261211 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -21,8 +21,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.3"; - sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + version = "1.2.4"; + sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.0"; - sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + version = "1.2.1"; + sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; @@ -706,8 +706,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.16"; - sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + version = "2.0.21"; + sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; }) (fetchNuGet { name = "NBitcoin"; @@ -726,13 +726,8 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.45"; - sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.51"; - sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + version = "5.0.60"; + sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) (fetchNuGet { name = "NBitpayClient"; @@ -741,8 +736,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.17"; - sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + version = "3.0.19"; + sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -956,8 +951,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "83.0.4103.3900"; - sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + version = "85.0.4183.8700"; + sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; }) (fetchNuGet { name = "Selenium.WebDriver"; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 13543114d64..2e6419fd13d 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.11.21"; + version = "20.11.23"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1q6sh2jhngvihkxjprkcd1php6r7m6qkxsijx8d3azzlgj9nbf2n"; + sha256 = "0hcvgph2m4nbrarhw2cggc8q5jxwnibiz2mbkypgizphk5svdj9l"; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 76ca21ef9aa..45143a797e5 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.42"; + version = "2.1.46"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi"; + sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 65afa6b72c4..85d395089de 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.6.1"; - sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + version = "16.7.1"; + sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -126,8 +126,8 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.6.1"; - sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + version = "16.7.1"; + sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -156,13 +156,13 @@ }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.6.1"; - sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + version = "16.7.1"; + sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.6.1"; - sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + version = "16.7.1"; + sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -181,18 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.19"; - sha256 = "12a3bf1pi6sq78z6h3clyczvycx7cjry8fby4fyi748wjwljjizz"; + version = "2.0.21"; + sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.11"; - sha256 = "09jrbq9p5k67kdic2038s7q299y2nc8ij6m55m3m8hys7jdrrv05"; + version = "2.0.12"; + sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.54"; - sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + version = "5.0.58"; + sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.60"; + sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -1061,8 +1066,8 @@ }) (fetchNuGet { name = "xunit.runner.visualstudio"; - version = "2.4.2"; - sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + version = "2.4.3"; + sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) (fetchNuGet { name = "xunit"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 136b0c2686d..78e6ad30b71 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */ + sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */ + sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; - sha256 = "1a09yahky8ii2dypj69m89c3yh7akn7sa74n0j0mff7r46ad421y"; /* updated by script */ + sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.2.5"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */ + sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.2.5"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */ + sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */ + sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */ + sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 93241b93b04..168c1d06b31 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -12,4 +12,5 @@ kak-powerline = pkgs.callPackage ./kak-powerline.nix { }; kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; + openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix new file mode 100644 index 00000000000..21c8b7a60cc --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "openscad.kak"; + version = "unstable-2019-11-08"; + + src = fetchFromGitHub { + owner = "mayjs"; + repo = "openscad.kak"; + rev = "d9143d5e7834e3356b49720664d5647cab9db7cc"; + sha256 = "0j4dqhrn56z77hdalfdxagwz8h6nwr8s9i4w0bs2644k72lsm2ix"; + }; + + installPhase = '' + install -Dm644 rc/openscad.kak -t $out/share/kak/autoload/plugins/ + ''; + + meta = with stdenv.lib; { + description = "Syntax highlighting for OpenSCAD files"; + homepage = "https://github.com/mayjs/openscad.kak"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 04bd6c7b4b8..bd8ad4b3d20 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0lj3fcfzprmv9raydx8yq25lw81bs6g40rhd0fv9d6idcb7wphf5"; + sha256 = "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fd94b4e26cf..6d4fa501710 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1ngyd3sfnhf8hpi015pgbms5bspc30lzrpfpw3jp992i4mzcjq0z"; + sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 467e593025e..0c7f3e8fe10 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; + sha256 = "1n6gbyzlc3kx2cq9wfz7azn7mrjmcc9pq436k1n4mrh0lik5sxw7"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index edfe5ca2dee..a4d925da3de 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.10"; + version = "1.4.0"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "0yrbcngmwhn5gl5if9w2cx8shh33zk5fd6iqwnapsq8y0lzq6ppr"; + sha256 = "0cdcn4qmdryk2x327f1z3pq8pg4cb0q1jr779gh8s6nqajyk8nqm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index f07db4c5c4a..22a35b3a4cc 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -18,7 +18,7 @@ , typescript }: stdenv.mkDerivation rec { - name = "imgbrd-grabber"; + pname = "imgbrd-grabber"; version = "7.3.2"; src = fetchFromGitHub { @@ -84,4 +84,11 @@ stdenv.mkDerivation rec { ''; sourceRoot = "source/src"; + + meta = with stdenv.lib; { + description = "Very customizable imageboard/booru downloader with powerful filenaming features"; + license = licenses.asl20; + homepage = "https://bionus.github.io/imgbrd-grabber/"; + maintainers = [ maintainers.evanjs ]; + }; } diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix index 80420202c05..1f6e20f465a 100644 --- a/pkgs/applications/graphics/imgp/default.nix +++ b/pkgs/applications/graphics/imgp/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "imgp"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13r4fn3dd0nyidfhrr7zzpls5ifbyqdwxhyvpkqr8ahchws7wfc6"; + sha256 = "1miabaxd5pwxn0va4drzj1d4ppxvyqsrrd4xw1j6qr52yci0lms8"; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index 5f8a0bb6eed..8cbc776132e 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -1,8 +1,12 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv +, buildGoPackage +, unstableGitUpdater +, fetchFromGitHub +}: buildGoPackage rec { - pname = "meme-unstable"; - version = "2017-09-10"; + pname = "meme"; + version = "unstable-2017-09-10"; owner = "nomad-software"; repo = "meme"; @@ -14,6 +18,8 @@ buildGoPackage rec { sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly"; }; + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index bb29101b4c7..96efc091ef2 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { pname = "pqiv"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "06cwm28b7j1skwp21s5snmj1pqh3xh6y2i5v4w3pz0b8k3053h9i"; + sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 11b49717693..c1255c016f4 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.10"; + version = "1.11"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "1ibf2lv3q69fkzv1nsva2mbdjlayrpxicrd96d9nfcw64f2mv6ds"; + sha256 = "01r4fq03fpyhwvn47wx3dw29vcadcd0qml00h36q38cq3pi9x42j"; }; buildInputs = [ diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d3aff8e6b1b..ca1a87dd2dd 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.6.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw="; + sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw="; }; vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4f1d4391181..4e928ff34f0 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.5"; + version = "7.3.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-CRyAeizhaSDmVFGRhrYIW0Ofli9HnkgItiAGRJAETQM="; + sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; }; installPhase = '' diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 7b1b20a1b78..eed618a5cbd 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -8,11 +8,11 @@ GEM gemojione (4.3.3) json github-markup (3.0.5) - gollum (5.1.1) + gollum (5.1.2) gemojione (~> 4.1) gollum-lib (~> 5.0) kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0.0) + kramdown-parser-gfm (~> 1.1.0) mustache (>= 0.99.5, < 1.0.0) octicons (~> 8.5) rss (~> 0.2.9) @@ -39,7 +39,7 @@ GEM json (2.3.1) kramdown (2.3.0) rexml - kramdown-parser-gfm (1.0.1) + kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) loofah (2.8.0) crass (~> 1.0.2) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 7d7c0ef3d5f..75ee9d05ab4 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371"; + sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykna2apphld9llmjnz0210fipp4fkmj2ja18l7iz9xikg0h0ihi"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index 70ff26784a8..c052b1ddb05 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gpx"; - version = "2.6.7"; + version = "2.6.8"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "markwal"; repo = "GPX"; rev = version; - sha256 = "1dl5vlsx05ipy10h18xigicb3k7m33sa9hfyd46hkpr2glx7jh4p"; + sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8"; }; meta = { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 5bad48edca1..3ded9f013fb 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.78.2"; + version = "0.79.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1xjxyx520wa6sgvighjp82qqfi0ykfskp0za5j95167c56ss8lm4"; + sha256 = "0i9c12w0jlfrqb5gygfn20rn41m7qy6ab03n779wbzwfqqz85mj6"; }; - vendorSha256 = "00jjcw76l12ppx3q1xhly7q10jfi2kx62a8z3r1k7m2593k8c4vq"; + vendorSha256 = "0jb6aqdv9yx7fxbkgd73rx6kvxagxscrin5b5bal3ig7ys1ghpsp"; doCheck = false; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix new file mode 100644 index 00000000000..7b2eeec292b --- /dev/null +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, autoPatchelfHook +, curl +, dpkg +, fetchurl +, gcc +, lib +, libGLU +, libcork +, makeDesktopItem +, qt5 +, quazip_qt4 +, zlib +}: +stdenv.mkDerivation rec { + pname = "ideamaker"; + version = "4.0.1"; + + src = fetchurl { + # N.B. Unfortunately ideamaker adds a number after the patch number in + # their release scheme which is not referenced anywhere other than in + # the download URL. Because of this, I have chosen to not use ${version} + # and just handwrite the correct values in the following URL, hopefully + # avoiding surprises for the next person that comes to update this + # package. + url = "https://download.raise3d.com/ideamaker/release/4.0.1/ideaMaker_4.0.1.4802-ubuntu_amd64.deb"; + sha256 = "0a1jcakdglcr4kz0kyq692dbjk6aq2yqcp3i6gzni91k791h49hp"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg qt5.wrapQtAppsHook ]; + buildInputs = [ + curl + gcc.cc.lib + libGLU + libcork + qt5.qtbase + qt5.qtserialport + quazip_qt4 + zlib + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + + cp usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin + ln -s "${desktopItem}/share/applications" $out/share/ + cp usr/share/ideamaker/icons/ideamaker-icon.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Ideamaker"; + genericName = meta.description; + categories = "Utility;Viewer;Engineering;"; + mimeType = "application/sla"; + }; + + meta = with lib; { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 34e7e145e74..3c915875096 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.5.2"; + version = "2.3.6"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "1pwdh0ljd7lm5a83vsqmp4695irhig07wxa90jc23ng5gap589na"; + sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 7553b078ef6..46d463645e5 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "1vrj8ad004h6jgmcb56f3f19s4xk6gvcpwysj78bxzgpa1998r3r"; + sha256 = "04ks38s6d3nkdj0arhxw8f3sfw796l97fbqxsm7b9g5d2953a6cs"; }; - cargoSha256 = "0yifgcf2pfszzny523ax7pb9a5r3012nynbnhdqg0j1ia1pdymf3"; + cargoSha256 = "1zwar1l793809bsgqnwrgi50y76bd78qd4s8lw6d64f4z72dh80g"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ac28694c45e..5618a8df910 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.15"; + version = "0.9.17"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "0cfzci2l1bbjc5mqs3hjyy3grz5jk3qbna57vfcvxz36kcd5djv5"; + sha256 = "0spa5zsipd456dcsp7ww24ab5vk4vmwyvrdmraw3hcsbnj9vcnwa"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 3cd9d5db006..d0459cb426c 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "0rqnbils0r98qglhm2jafw5d119fqdzszmk825yc0bma4icm7xzp"; + sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa"; }; - cargoSha256 = "1f3g5i0yh82qll1hyihrvv08pbd4h9vzs6jy6bf94bzabyjsgnzv"; + cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 4987988eb3e..d76dd8b9daa 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { contribute to your favorite creators automatically. ''; license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik rht jefflabonte ]; + maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6281013a681..c106838b354 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "88.0.4324.11", - "sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315", - "sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby", + "version": "88.0.4324.27", + "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", + "sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4", "deps": { "gn": { "version": "2020-11-05", diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 988f47f3bfb..1fbfdc2a7da 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -118,6 +118,7 @@ buildStdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + ./no-buildconfig-ffx76.patch ] ++ # there are two flavors of pipewire support diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 352e7bac5e9..d31a1a0e54c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, callPackage, fetchurl, nss_3_44 }: +{ stdenv, lib, callPackage, fetchurl, fetchpatch }: let common = opts: callPackage (import ./common.nix opts) {}; @@ -14,7 +14,14 @@ rec { }; patches = [ - ./no-buildconfig-ffx76.patch + # Fix compilation on aarch64 with newer rust version + # See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690 + # and https://bugzilla.redhat.com/show_bug.cgi?id=1897675 + (fetchpatch { + name = "aarch64-simd-bgz-1677690.patch"; + url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch"; + sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin"; + }) ]; meta = { @@ -41,10 +48,6 @@ rec { sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd"; }; - patches = [ - ./no-buildconfig-ffx76.patch - ]; - meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 542d4329481..5d299f3349e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.15.0"; + version = "28.16.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1sbs3gcwfx58mxc0x1g6jklmvpa9dw2bq3i8y9645gfa1s12p8wy"; + sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 19fc90ca9e4..ffe79381a22 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.7.5"; + version = "1.8.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "10h2ak3s74xb1rjvc6bc5yiyq2k8qbv07wxnshiqp5cnd6pjni0w"; + sha256 = "0fwc56797gmcg9pcy0jpv5lb0b6wwiqh242xn1chd4a4hp8in7h9"; }; - vendorSha256 = "1xj77w2h7qg808v6ll8hm5nvnb2lwky789aikgxli2k6m0cy0c5k"; + vendorSha256 = "0ing5pih2rz974dcianlb05fpgrj3y7h32awf3cp41gh448gxd24"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index c7094e1c77e..e1f1a0ef38a 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,42 +1,94 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq +#! nix-shell -i bash -p coreutils curl jq moreutils # shellcheck shell=bash +# vim: ft=sh +# +# Update a terraform provider to the latest version advertised at the +# provider source address. # -# Update a terraform provider to the latest version advertised at -# the provider source address. set -euo pipefail -USAGE=$(cat<<DOC -Specify the terraform provider name to update. +show_usage() { + cat <<DOC +Usage: ./update-provider [--force] [--vendor] [<owner>/]<provider> + +Update a single provider in the providers.json inventory file. + +For example to update 'terraform-providers.aws' run: + + ./update-provider aws + +If the provider is not in the list already, use the form '<owner>/<provider>' +to add the provider to the list: -Example: -To update nixpkgs.terraform-providers.aws run: -./update-provider aws + ./update-provider hetznercloud/hcloud + +Options: + + * --force: Force the update even if the version matches. + * --vendor: Switch from go package to go modules with vendor. + * --vendor-sha256 <sha256>: Override the SHA256 or "null". DOC -) +} + +force= +provider= +vendor= +vendorSha256= + +while [[ $# -gt 0 ]]; do + case "$1" in + -h | --help) + show_usage + exit + ;; + --force) + force=1 + shift + ;; + --vendor) + force=1 + vendor=1 + shift + ;; + --vendor-sha256) + force=1 + vendorSha256=$2 + shift 2 + ;; + *) + if [[ -n "$provider" ]]; then + echo "ERROR: provider name was passed two times: '$provider' and '$1'" + echo "Use --help for more info" + exit 1 + fi + provider=$1 + shift + esac +done -provider_name="${1:-}" -if [ -z "$provider_name" ]; then - echo "No providers specified!" +if [[ -z "$provider" ]]; then + echo "ERROR: No providers specified!" echo - echo "$USAGE" + show_usage exit 1 fi -provider_source_address="$(jq -r ".$provider_name.\"provider-source-address\"" providers.json)" +provider_name=$(basename "$provider") -if [ "$provider_source_address" == "null" ]; then - echo "No provider source address specified with provider: $provider_name" - exit 1 -fi +# Usage: read_attr <key> +read_attr() { + jq -r ".\"$provider_name\".\"$1\"" providers.json +} -# The provider source address (used inside Terraform `required_providers` block) is -# used to compute the registry API endpoint -# -# registry.terraform.io/hashicorp/aws (provider source address) -# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) -# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) -registry_response=$(curl -s https://"${provider_source_address/\///v1/providers/}") +# Usage: update_attr <key> <value> +update_attr() { + if [[ "$2" == "null" ]]; then + jq -S ".\"$provider_name\".\"$1\" = null" providers.json | sponge providers.json + else + jq -S ".\"$provider_name\".\"$1\" = \"$2\"" providers.json | sponge providers.json + fi +} prefetch_github() { # of a given owner, repo and rev, fetch the tarball and return the output of @@ -47,31 +99,80 @@ prefetch_github() { nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz" } +old_source_address="$(read_attr provider-source-address)" +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) + +if [[ $provider =~ ^[^/]+/[^/]+$ ]]; then + source_address=registry.terraform.io/$provider +else + source_address=$old_source_address +fi +if [[ "$source_address" == "null" ]]; then + echo "Could not find the source address for provider: $provider" + exit 1 +fi +update_attr "provider-source-address" "$source_address" + +# The provider source address (used inside Terraform `required_providers` block) is +# used to compute the registry API endpoint +# +# registry.terraform.io/hashicorp/aws (provider source address) +# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) +# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) +registry_response=$(curl -s https://"${source_address/\///v1/providers/}") + +version="$(jq -r '.version' <<< "$registry_response")" +if [[ "$old_version" = "$version" && "$force" != 1 && -z "$vendorSha256" && "$old_vendor_sha256" != "$vendorSha256" ]]; then + echo "$provider_name is already at version $version" + exit +fi +update_attr version "$version" + provider_source_url="$(jq -r '.source' <<< "$registry_response")" org="$(echo "$provider_source_url" | cut -d '/' -f 4)" +update_attr owner "$org" repo="$(echo "$provider_source_url" | cut -d '/' -f 5)" +update_attr repo "$repo" rev="$(jq -r '.tag' <<< "$registry_response")" - +update_attr rev "$rev" sha256=$(prefetch_github "$org" "$repo" "$rev") +update_attr sha256 "$sha256" -version="$(jq -r '.version' <<< "$registry_response")" +repo_root=$(git rev-parse --show-toplevel) -updated_provider="$(mktemp)" -cat <<EOF >> "$updated_provider" -{ - "$provider_name": { - "owner": "$org", - "repo": "$repo", - "rev": "$rev", - "sha256": "$sha256", - "version": "$version", - "provider-source-address": "$provider_source_address" - } -} -EOF +if [[ -z "$vendorSha256" ]]; then + if [[ "$old_vendor_sha256" == null ]]; then + vendorSha256=null + elif [[ -n "$old_vendor_sha256" || "$vendor" = 1 ]]; then + echo "=== Calculating vendorSha256 ===" + update_attr vendorSha256 "0000000000000000000000000000000000000000000000000000000000000000" + # Hackish way to find out the desired sha256. First build, then extract the + # error message from the logs. + set +e + nix-build --no-out-link "$repo_root" -A "terraform-providers.$provider_name.go-modules" 2>vendor_log.txt + set -e + logs=$(< vendor_log.txt) + if ! [[ $logs =~ got:\ +([^\ ]+) ]]; then + echo "ERROR: could not find new hash in output:" + cat vendor_log.txt + rm -f vendor_log.txt + exit 1 + fi + rm -f vendor_log.txt + vendorSha256=${BASH_REMATCH[1]} + # Deal with nix unstable + if [[ $vendorSha256 = sha256-* ]]; then + vendorSha256=$(nix to-base32 "$vendorSha256") + fi + fi +fi -original_provider_list="$(mktemp)" -cat providers.json > "$original_provider_list" +if [[ -n "$vendorSha256" ]]; then + update_attr vendorSha256 "$vendorSha256" +fi -jq --sort-keys --slurp '.[0] * .[1]' "$original_provider_list" "$updated_provider" > providers.json +# Check that the provider builds +echo "=== Building terraform-providers.$provider_name ===" +nix-build "$repo_root" -A "terraform-providers.$provider_name" diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index f9abd3fef3c..13dc38aaba9 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.8.2"; + version = "3.8.3"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0vy89ih586s89s29dzzggk7bkaz70mzrc9islirk01s1jal1jn0v"; + sha256 = "1704nj77h6s88l4by3wxl5l770gaig90mv3ix80r00nh8mhzq44q"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index c9dd22f1831..6b511d1a1a9 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1y0k9vfb4818b3s313jlxbpjwdxd62cc4kc1vpxdjvs8mx543vrv"; + sha256 = "1j0yd33sm824dy4mhwfxqkywa46yhqy5hd5wq4lp7lgl6m6mypar"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index dbf6cf46e92..a177499154e 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.4.3"; + version = "5.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0yd4g87kcwiy1arx3y2nyb7lq1nlh4cn87762k2sd8n4s9i52c7r"; + sha256 = "059zfcvaq8wnsz2lfd4gdb17b6nngqk3vgisy2kb29ifqf3lpzqi"; name="${pname}-${version}.AppImage"; }; @@ -32,7 +32,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Desktop client for Zulip Chat"; - homepage = "https://zulipchat.com"; + homepage = "https://zulip.com"; license = licenses.asl20; maintainers = with maintainers; [ jonafato ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index a11e5763699..30ca6d6c7ec 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inboxer"; - version = "1.2.1"; + version = "1.2.3"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a"; + sha256 = "1ak8sr9sc0fkbrmfynxivbn9csrbyly4fhjlk7kx10aq8hk893a7"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 44084daf9c0..124e3492c8c 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "magnetico"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "boramalper"; repo = "magnetico"; rev = "v${version}"; - sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn"; + sha256 = "1avqnfn4llmc9xmpsjfc9ivki0cfvd8sljfzd9yac94xcj581s83"; }; - vendorSha256 = "0g4m0jnpy0q64xnflphyc0lmhni0q9448h7grbbr7f1s9lpqsjml"; + vendorSha256 = "087kikj6sjhjxqymnj7bpxawfmwckihi6mbmi39w0bn2040aflx5"; nativeBuildInputs = [ go-bindata ]; buildPhase = '' diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3fe3b665075..d0a396d6a90 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "08jv8dbvdygcm6wzvncx89p8cn9mbjn4lj8rf5svq8lr7zk1rvpw"; + sha256 = "0w41p2fm26ml5dvdg2cnxcw0xzsbjq26chpa3bkn1adpazlpivp4"; }; vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index febb1e69982..84b571a20f0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.11.1"; + version = "1.12.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0x5a24r74i9am6a8k32qkb2vck28d2jiy4yhpb4g774m4krjqxd2"; + sha256 = "09kqc66pnklhmlcn66c5zydnvy2mfs2hqzd1465ydww8bbgcncss"; }; - vendorSha256 = "0ap287996ix119hkdyssn2q2bqjbgdshi9a67hf8msfp7k9warm7"; + vendorSha256 = "1jw0k1wm9mfsa2yr2fi2j8mrlykrlcwfnii07rafv9dnnwabs022"; doCheck = false; diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix new file mode 100644 index 00000000000..98877880255 --- /dev/null +++ b/pkgs/applications/networking/twtxt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "twtxt"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jointwt"; + repo = pname; + rev = version; + sha256 = "15jhfnhpk34nmad04f7xz1w041dba8cn17hq46p9n5sarjgkjiiw"; + }; + + vendorSha256 = "1lnf8wd2rv9d292rp8jndfdg0rjs6gfw0yg49l9spw4yzifnd7f7"; + + subPackages = [ "cmd/twt" "cmd/twtd" ]; + + meta = with lib; { + description = "Self-hosted, Twitter-like decentralised microblogging platform"; + homepage = "https://github.com/jointwt/twtxt"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d6b404f9db7..cee8098f451 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.16"; + version = "1.17"; src = fetchPypi { inherit pname version; - sha256 = "436b6f9441a638f8028729c2a39c28433f7878c2af6ddb9bfccaeea9ea3086e1"; + sha256 = "efad3a4b5697b9d7ee29eff5dc0c8367fc1df37b1abacc8d0b2071602e94a6cd"; }; checkInputs = [ python3.pkgs.pytest ]; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index cb88e92fe1c..ece218eea37 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ]; + buildInputs = [ itk4 vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 6ee7cd609c4..3b1420a1881 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; pname = "hmmer"; src = fetchurl { url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "1mcvr74w6ffd5z0p8v3jss473mbgard9lz5whjnk95c661lnmrlc"; + sha256 = "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 8bc62da3a31..d432e66a19f 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "1w8av44dx5r9yp2xhf9ypdrhappvk984wrd5pa1ww0qv6j2446ic"; + sha256 = "0xr9plgb0cfmxxqmd3wrhvl0hv2jqqfqzxwzs1jysq2m9cxl314v"; }; patches = [ diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 29d727d988e..426c5a9df32 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2020.06.22"; + version = "2020.11.24"; src = fetchFromGitHub { - owner = "berkeley-abc"; + owner = "yosyshq"; repo = "abc"; - rev = "341db25668f3054c87aa3372c794e180f629af5d"; - sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s"; + rev = "4f5f73d18b137930fb3048c0b385c82fa078db38"; + sha256 = "0z1kp223kix7i4r7mbj2bzawkdzc55nsgc41m85dmbajl9fsj1m0"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index aedc8e3484a..0364a76639a 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, python3 +{ stdenv, fetchFromGitHub, fetchpatch, lib, python3 , cmake, lingeling, btor2tools, gtest, gmp }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci"; }; + # excludes development artifacts from install, will be included in next release + patches = [ + (fetchpatch { + url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch"; + sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw"; + }) + ]; + postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; @@ -23,39 +31,39 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUSE_LINGELING=YES" - "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include" - "-DBtor2Tools_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); - installPhase = '' - mkdir -p $out/bin $lib/lib $dev/include - - cp -vr bin/* $out/bin - cp -vr lib/* $lib/lib - - rm -rf $out/bin/{examples,tests} - # we don't care about gtest related libs - rm -rf $lib/lib/libg* - - cd ../src - find . -iname '*.h' -exec cp --parents '{}' $dev/include \; - rm -rf $dev/include/tests - ''; - checkInputs = [ python3 ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(readlink -f lib) - patchShebangs .. + preCheck = + let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + # tests modelgen and modelgensmt2 spawn boolector in another processes and + # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing + stdenv.lib.optionalString stdenv.isDarwin '' + cp -r bin bin.back + install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector + '' + '' + export ${var}=$(readlink -f lib) + patchShebangs .. + ''; + + postCheck = stdenv.lib.optionalString stdenv.isDarwin '' + rm -rf bin + mv bin.back bin ''; - outputs = [ "out" "dev" "lib" ]; + # this is what haskellPackages.boolector expects + postInstall = '' + cp $out/include/boolector/boolector.h $out/include/boolector.h + cp $out/include/boolector/btortypes.h $out/include/btortypes.h + ''; meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; homepage = "https://boolector.github.io"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 34c0dac2a17..7d2aed7596e 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "btor2tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 41c9846b23b..1b6dc2ae007 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "03ij2hnh393gw59hgrz3qrmgc4qw82bc9nd98sks4jrp5gwk4zz2"; + sha256 = "0shwi41van3k0z6rnpl3sz5nh46xbyyljwfpcp8pwxbc26aw5169"; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index e1cf5a0f08d..7d77453cbab 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2020b"; + version = "2020e"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "0mpb8gc0mcfql8lzwknpkf1sg7mj9ikzd8r1x5xniabd9mmdhplm"; + sha256 = "105y5hkzgyvad6wc3y7nn327bvrsch6jp03ckkn0w0hpnhiywzx7"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix new file mode 100644 index 00000000000..6aa4bcc52bc --- /dev/null +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -0,0 +1,29 @@ +{ lib, python3, git, mercurial}: + +python3.pkgs.buildPythonApplication rec { + pname = "bumpver"; + version = "2020.1107"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "75704333a8d1699e2cadcf1fcd3027a2cab6837ae343af10a61c6eef4e0313d7"; + }; + + prePatch = '' + substituteInPlace setup.py \ + --replace "if any(arg.startswith(\"bdist\") for arg in sys.argv):" ""\ + --replace "import lib3to6" ""\ + --replace "package_dir = lib3to6.fix(package_dir)" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ]; + + checkInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + + meta = with lib; { + description = "Bump version numbers in project files"; + homepage = "https://pypi.org/project/bumpver/"; + license = licenses.mit; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 140c2647be2..fe67aca55d1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.3.2"; + version = "0.3.3"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0n268xlsd9p5f083sqwzpvsqg99fdk876mf8gihkydakrismc45b"; + sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b4e71384826..db18e765b00 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1ii6vjgs5nd2hhp475mqa48165garc7ac2w9fyspajaanc7zhnik"; + sha256 = "0jd28281wys2iy7pbyyrzkzrkzq9ms7p9pbj6j2fha6bg1bh7rkz"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 29c8fac962b..340ab283bf6 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.6"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-mEhtFcWLUhd+WK8wDhrGr6RvL4X2G42W6su/c8zxGR4="; + sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9"; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8b93bf2176a..4fc84767cd4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.4.0"; + version = "7.4.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0ih0jxdm74vr4dgslhnl3llvi31zin0g2xjw6a4pdji2y2kajkzk"; + sha256 = "1c9cyxx5sqvnilf6xp3ildq3lwl6mj8v1vl0wzyjpaiqky99lj9p"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index e90f47e51f3..bb720df3f27 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.8"; + version = "1.0.0-alpha.11"; src = fetchCrate { inherit version pname; - sha256 = "01wag3ckqsa7r6zc7cla428w8hr49n2ybp31s42dqmsbak3xbc14"; + sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx"; }; - cargoSha256 = "1hh4xmkhbbbkag3v25vh6zpn0r4fmipxmkcr8ahgrxf71dvyxj8x"; + cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; LIBCLANG_PATH = "${libclang}/lib"; diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index 8f77fdbe54c..6f639ecd77f 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sparkleshare"; - version = "3.28"; + version = "3.38"; src = fetchFromGitHub { owner = "hbons"; repo = "SparkleShare"; rev = version; - sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497"; + sha256 = "1a9csflmj96iyr1l0mdm3ziv1bljfcjnzm9xb2y4qqk7ha2p6fbq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index d979a25d2d1..fa6cf88440f 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { - sha256 = "1ckcprqck96ns752vk9bzlc3gm6b5f0piff2d3m55zrvdh7wpgy5"; + sha256 = "1p8pqa5s70basdm2zpmahc54shsxrr0fr7chvv425n5a9sqba4dh"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix new file mode 100644 index 00000000000..b7f7f8c5302 --- /dev/null +++ b/pkgs/applications/video/qmplay2/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cmake +, alsaLib +, ffmpeg +, libass +, libcddb +, libcdio +, libgme +, libpulseaudio +, libsidplayfp +, libva +, libXv +, taglib +, qtbase +, qttools +, vulkan-headers +, vulkan-tools +, wrapQtAppsHook +}: + +let + pname = "qmplay2"; + version = "20.07.04"; +in stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "zaps166"; + repo = "QMPlay2"; + rev = version; + sha256 = "sha256-sUDucxSvsdD2C2FSVrrXeHdNdrjECtJSXVr106OdHzA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ + alsaLib + ffmpeg + libass + libcddb + libcdio + libgme + libpulseaudio + libsidplayfp + libva + libXv + qtbase + qttools + taglib + vulkan-headers + vulkan-tools + ]; + + postInstall = '' + # Because we think it is better to use only lowercase letters! + ln -s $out/bin/QMPlay2 $out/bin/qmplay2 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/zaps166/QMPlay2/"; + description = "Qt-based Multimedia player"; + longDescription = '' + QMPlay2 is a video and audio player. It can play all formats supported by + FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw + files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 + browser. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index b1db8cc57d2..1b3ca285048 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.11.25"; + version = "20.11.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1nm71gnjd082m7bxlmrkngn079m3fdrb059f7wy23qj7khgpi3iz"; + sha256 = "1yr71ihml9wnm7y5pv0gz41l1k6ybd16dk78zxf96kn9b838mzhq"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 50b9b8f36aa..cece3cc6b67 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,15 +4,15 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.4.2"; + version = "1.4.3"; # git commit for the above version's tag - commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; + commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "17ciyvqz0j1q2vyzwkz6bkvxpz2d7y1kk99fv68ar7l4mr8pyp78"; + sha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5df0ae39a25..1d55744efb4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -212,14 +212,14 @@ rec { }; docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.13"; + version = "19.03.14"; rev = "v${version}"; - sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f"; + sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above - containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7 - containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7"; + containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9 + containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b05149fd150..dd56efe60f8 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "0cy842wlyasxlxnwxkwhwgj148s30kfxnhgxa6ar26fly432aa68"; + sha256 = "13na6ms0dapcmfb4pg8z3sds9nprr1lyyjs0v2izqifcyb1r1c00"; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 163a87d7072..5d4b891ad5d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -83,6 +83,12 @@ stdenv.mkDerivation rec { ./fix-qemu-ga.patch ./9p-ignore-noatime.patch ./CVE-2020-27617.patch + (fetchpatch { + # e1000e: infinite loop scenario in case of null packet descriptor, remove for QEMU >= 5.2.0-rc3 + name = "CVE-2020-28916.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=c2cb511634012344e3d0fe49a037a33b12d8a98a"; + sha256 = "1kvm6wl4vry0npiisxsn76h8nf1iv5fmqsyjvb46203f1yyg5pis"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 3b1b8ff570a..6da0e58436d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation { else if targetPlatform.isWindows then "pe" else "elf" + toString targetPlatform.parsed.cpu.bits; endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; - sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower) "-"; + sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower && !targetPlatform.isRiscV) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isAarch32 then endianPrefix + "arm" @@ -187,6 +187,7 @@ stdenv.mkDerivation { else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" + else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index db1062e1b5d..b30ac5c7765 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,4 +1,5 @@ { + bashInteractive, buildPackages, cacert, callPackage, @@ -29,6 +30,7 @@ writeReferencesToFile, writeScript, writeText, + writeTextDir, writePython3, system, # Note: This is the cross system we're compiling for }: @@ -70,7 +72,7 @@ in rec { examples = callPackage ./examples.nix { - inherit buildImage pullImage shadowSetup buildImageWithNixDb; + inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb; }; pullImage = let @@ -684,6 +686,33 @@ rec { in result; + # Provide a /etc/passwd and /etc/group that contain root and nobody. + # Useful when packaging binaries that insist on using nss to look up + # username/groups (like nginx). + # /bin/sh is fine to not exist, and provided by another shim. + fakeNss = symlinkJoin { + name = "fake-nss"; + paths = [ + (writeTextDir "etc/passwd" '' + root:x:0:0:root user:/var/empty:/bin/sh + nobody:x:65534:65534:nobody:/var/empty:/bin/sh + '') + (writeTextDir "etc/group" '' + root:x:0: + nobody:x:65534: + '') + (runCommand "var-empty" {} '' + mkdir -p $out/var/empty + '') + ]; + }; + + # This provides /bin/sh, pointing to bashInteractive. + binSh = runCommand "bin-sh" {} '' + mkdir -p $out/bin + ln -s ${bashInteractive}/bin/bash $out/bin/sh + ''; + # Build an image and populate its nix database with the provided # contents. The main purpose is to be able to use nix commands in # the container. diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 3f30f1a2adb..85ddeb25740 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -7,7 +7,7 @@ # $ nix-build '<nixpkgs>' -A dockerTools.examples.redis # $ docker load < result -{ pkgs, buildImage, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }: +{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }: rec { # 1. basic example @@ -44,7 +44,7 @@ rec { nginx = let nginxPort = "80"; nginxConf = pkgs.writeText "nginx.conf" '' - user nginx nginx; + user nobody nobody; daemon off; error_log /dev/stdout info; pid /dev/null; @@ -64,10 +64,13 @@ rec { <html><body><h1>Hello from NGINX</h1></body></html> ''; in - buildImage { + buildLayeredImage { name = "nginx-container"; tag = "latest"; - contents = pkgs.nginx; + contents = [ + fakeNss + pkgs.nginx + ]; extraCommands = '' # nginx still tries to read this directory even if error_log @@ -75,12 +78,6 @@ rec { mkdir -p var/log/nginx mkdir -p var/cache/nginx ''; - runAsRoot = '' - #!${pkgs.stdenv.shell} - ${shadowSetup} - groupadd --system nginx - useradd --system --gid nginx nginx - ''; config = { Cmd = [ "nginx" "-c" nginxConf ]; diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker index 1b6785189c2..5798ab5984f 100755 --- a/pkgs/build-support/docker/nix-prefetch-docker +++ b/pkgs/build-support/docker/nix-prefetch-docker @@ -127,7 +127,7 @@ trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" if test -z "$QUIET"; then - skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" >&2 else skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null fi @@ -139,12 +139,12 @@ imageHash=$(nix-hash --flat --type $hashType --base32 "$tmpFile") finalPath=$(nix-store --add-fixed "$hashType" "$tmpFile") if test -z "$QUIET"; then - echo "-> ImageName: $imageName" - echo "-> ImageDigest: $imageDigest" - echo "-> FinalImageName: $finalImageName" - echo "-> FinalImageTag: $finalImageTag" - echo "-> ImagePath: $finalPath" - echo "-> ImageHash: $imageHash" + echo "-> ImageName: $imageName" >&2 + echo "-> ImageDigest: $imageDigest" >&2 + echo "-> FinalImageName: $finalImageName" >&2 + echo "-> FinalImageTag: $finalImageTag" >&2 + echo "-> ImagePath: $finalPath" >&2 + echo "-> ImageHash: $imageHash" >&2 fi if [ "$format" == "nix" ]; then diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 8188c569ff7..90b64c5f159 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "3.7.1"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index b3fd986c4ca..e3157db6c91 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0h226f32nwlqnsdc86bwk2wcdl2hsq5q1s2ln6dsf9m7w8ajn0nr"; - iosevka-aile = "05k3h7n7mkpdsjcxha27vjj503b4129jd90wj8qyk5h0nrgy1rc6"; - iosevka-curly = "0fxcc99n9ghkdjmfxba9mg4fc0dwlvnnxlmc618jv6s3k2xn7sza"; - iosevka-curly-slab = "1qgxyw5v91l4cw3mvqzagk9amyy63iqh72bnsz63daxgss3fpsab"; - iosevka-etoile = "184rjidnjayv5wsrxxxf39mvdcjafdwcvp0h4rfniy9s0ifrwjvf"; - iosevka-slab = "1cbrv5pyhnvwrdaj8r011igw2yjgzzigd82g1r10d348lk64wja1"; - iosevka-sparkle = "124jnjzffnfw58b78svw8rzgal10z5nspwc267pvq7q0f2ak1wpp"; - iosevka-ss01 = "18ckb0ch4za4vgwqz8azx8vhg9v9a922ffbckrbmy8n5bi03dl7w"; - iosevka-ss02 = "0cwm2jdni5m9z0xagpmq9vvjp3yvin7c7bnavsj15yfvpq8b8qsp"; - iosevka-ss03 = "1yzbvkr726f8mm024qzy2hdd7nz4kymgjm0cj5208c57bln0byr2"; - iosevka-ss04 = "1kpz84a1cb39rxc87whw0fh0k9ak2qbcq59hm425da2acf27a648"; - iosevka-ss05 = "1xnnm96jnw90mhwylsw1ad6m8pr4r1bd02l7g82m5hmr7bc4b7dd"; - iosevka-ss06 = "1raw01ijiawaqxfmj0m8z8jrb2ns7vzy68lak63mss8j35xzg1l5"; - iosevka-ss07 = "0bjhjwjif7qw6wyyrzfg2pdvy1b070k053ndmjard6sh1rcln02d"; - iosevka-ss08 = "1qwgk8riff57np4hlmd0kcl9bx511x9zmnlrjq3ilfn6abdwgm7i"; - iosevka-ss09 = "0sfnhmcrsv1v7l756hx70y1mrp35fbs6wrsczw4vxfbbaigs767r"; - iosevka-ss10 = "10n70z7588h8y2z274vjn6hvzc7lg87znibcmkk2brmx2g5bw2wl"; - iosevka-ss11 = "0mnyd04vdqr8jm3syv6ddrn61f27k91kxkdy86pp34xaac2ipmm0"; - iosevka-ss12 = "1f8pn2220s6r566b40ncnqrfmfdhnlr0nkvzj9swgvx66jr8mlhj"; - iosevka-ss13 = "1py5qgfqm9wp9pzcxg83mydvf3r6nhrqi21d0fvmnk04ghk1psd6"; - iosevka-ss14 = "0z47kqicd26x5v94zy97xyl277v0s6856pbllfn1gv92ax2dg5cy"; + iosevka = "05wlap8r7kfg5zyj8gf7i1cypgs6lwpkh51g4cyj01zjkkv9g7k8"; + iosevka-aile = "18qa6q1djjr34aj340ab47ajkkcq4wfv7m36f303kabgwfif247r"; + iosevka-curly = "138hl95n3c2cfblzgh8adi1aljwn1xljjbffd0nrb12hipmgddql"; + iosevka-curly-slab = "0x18zzphri1fx4lql51n8bam0pq2xb61p1gx50km3wlvkrbmbj23"; + iosevka-etoile = "0byv8x3nqjka4ivpa8h6hq2k18cjnf69qmcc06dy4ym45a34qqsw"; + iosevka-slab = "0a2h1g69r9nmp5cskgciywsiq07rxn0cskhvwbwaq64rsqbr1l58"; + iosevka-sparkle = "13kwdgziylicwkl9s9v9bx9zbbrsrys6n7gx2jzgkdlsj8wkd73i"; + iosevka-ss01 = "0achcgfcya6sl15wknlyyghpz3d7q62wa0fikl74wr5xyl7h7f1f"; + iosevka-ss02 = "09gsawl61acykpd2429g1mz0l7i4gl0j1fl0lzc1giy6kbvrkggb"; + iosevka-ss03 = "07fdxmlpqv6z5hbly8l344x96m80jbz8rq5h9qkfz63xlq0376sj"; + iosevka-ss04 = "0q3v6spylhaxsf6spv6q5kh87mxbkh9x04s3h1g3rjv6gdlxi9n4"; + iosevka-ss05 = "1zzdx4d6zrc1qbhsp0bfg91v63h1y943pylfxns09bzk9wjppvba"; + iosevka-ss06 = "1a3ar8xhn9rf5isxvwqvifczl20ddgs4dw9ypjflmdbyhr3n0yw5"; + iosevka-ss07 = "01x33sx5d54mdph7csnk6mhkhyc879rwp9spxwyrajghzd0ql8w6"; + iosevka-ss08 = "0a1kmyr5q2w7qky0ya0gaqmg0lhdafyag8c8idacl7gnra944hi0"; + iosevka-ss09 = "0m7cm8c3795a8kfy19d9wjmii6ycimcclg5pn9g91kg49q8y9gi2"; + iosevka-ss10 = "1gfdjz6yifbyb9gl19q3q69as3fnmih17ghhrzzhc7qll68r6k6z"; + iosevka-ss11 = "119ivw6kcqvzbj46xv8avpg56w3nqdkhhl176gj3bpk1jbjip1wh"; + iosevka-ss12 = "1vx8rc328whsjjj87fa29kpp9ibk6x52r1brjp37cywjd5ix6l78"; + iosevka-ss13 = "1gmmm2jlvrl6pzcsc2bhy3qvmzmsns8hlc52ddrwdbw0wi28zhs3"; + iosevka-ss14 = "0mwg2bvkpxzpsdhky9k6fn81061pk0f23whj1hj4mn191xpw41fy"; } diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 153c6272ca2..2daf66e7510 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.03"; + version = "13.0.04"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; + sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 6d2c58afdb2..19f02a16f47 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.10"; + version = "3.11"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "1zza0jrs82112dcjqgkyck2b7hv4kg9s10pmlripi6c1rs37av14"; + sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 751dd690d11..3d14f782c69 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-03-19"; + version = "2020-11-29"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx"; + sha256 = "07lcg28y0scpii29j85343kmcga4wyaayjpx9a118z838mnvb757"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 1b3d2005f08..43636b584d3 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2020-02-24"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv"; + sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 71eb54ea202..00ea002f746 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.6.4"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd"; + sha256 = "1369iig7w0x45sr9yd4a5xxqrwsfwq90hlnknarhz62h5hpykjwi"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 9edc1368707..0e84302f6c6 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.6.1"; + version = "4.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx"; + sha256 = "1fsiq8q8b65skxbg1bsishygnw2zg8kr0d09rassqjdimd4yfi1y"; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 4e9c09f4d73..02082f64ed3 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.6.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv"; + sha256 = "0sbfd1d4kjiccaq9s36r2cvdcmvd1x2087nkfgl32gwxakqi3g4n"; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 142c586d8d6..8e29aa9fcc7 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.6.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; + sha256 = "1j3azjwin89z5v6nphx0wsa35p224h2gps50kcq9gwankkfcf3q1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 014ad123b41..7f0c7c4f621 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zrm4mihkx5i42h3pvk9lmsqf983dqz4rnfcbccwhx4ml2s4w3qv"; + sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 3d969f5c0bf..d85efd0a4da 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -9,15 +9,12 @@ , gobject-introspection , wrapGAppsHook , glib +, glib-networking , gtk3 , openssh , gnome3 , gjs , nixosTests -, atk -, harfbuzz -, pango -, gdk-pixbuf , gsettings-desktop-schemas }: @@ -55,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib # libgobject + glib-networking gtk3 gsound gjs # for running daemon @@ -87,20 +85,18 @@ stdenv.mkDerivation rec { done ''; - postFixup = let - testDeps = [ - gtk3 harfbuzz atk pango.out gdk-pixbuf - ]; - in '' + postFixup = '' # Let’s wrap the daemons for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do echo "Wrapping program $file" wrapGApp "$file" done - wrapProgram "$installedTests/libexec/installed-tests/gsconnect/minijasmine" \ - --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + # Wrap jasmine runner for tests + for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do + echo "Wrapping program $file" + wrapGApp "$file" + done ''; uuid = "gsconnect@andyholmes.github.io"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a51eb854e73..a042ce134a9 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,42 +1,69 @@ -{ stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas -, itstool, libxml2, python3Packages, libhandy_0 -, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: +{ lib +, meson +, ninja +, fetchurl +, gdk-pixbuf +, gettext +, glib +, gnome3 +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, itstool +, libhandy_0 +, libnotify +, libsoup +, libxml2 +, pkg-config +, python3Packages +, wrapGAppsHook }: -let +python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; version = "3.34.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python + gettext + gobject-introspection + itstool + libxml2 + meson + ninja + pkg-config + wrapGAppsHook ]; + buildInputs = [ - gtk3 glib gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - libnotify gnome3.gnome-shell python3Packages.pygobject3 - libsoup gnome3.gnome-settings-daemon gnome3.nautilus - gnome3.mutter gnome3.gnome-desktop gobject-introspection - gnome3.nautilus libhandy_0 + gdk-pixbuf + glib + gnome3.gnome-desktop + gnome3.gnome-settings-daemon + gnome3.gnome-shell # Makes it possible to select user themes through the `user-theme` extension gnome3.gnome-shell-extensions + gnome3.mutter + gsettings-desktop-schemas + gtk3 + libhandy_0 + libnotify + libsoup + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 ]; postPatch = '' patchShebangs meson-postinstall.py ''; - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -44,7 +71,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; description = "A tool to customize advanced GNOME 3 options"; maintainers = teams.gnome.members; diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index ff7b7274ca9..cd3dd32f380 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }: stdenv.mkDerivation rec { version = "1.6.0"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; }; - phases = ["installPhase"]; - installPhase = "ln -s $src $out"; + nativeBuildInputs = [ python3Packages.wrapPython installShellFiles ]; + propagatedBuildInputs = with python3Packages; [ pyserial ]; + installPhase = '' + mkdir $out + cp -rT $src $out + installManPage *.1 + ''; + postFixupPhase = '' + wrapPythonPrograms + ''; meta = { description = "Makefile for Arduino sketches"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 8a18b6306c2..51e0842d4be 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -37,13 +37,13 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "201911"; + version = "202011"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q"; + sha256 = "1fvlz1z075jr6smq9qa0asy6fxga1gljcfd0764ypzy1mw963c9s"; }; buildInputs = [ libuuid pythonEnv ]; diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index aae6f168280..c67b011721a 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f"; + hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY="; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 62867f296d7..b87bec7ea2d 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, unstableGitUpdater , cmake , callPackage @@ -46,8 +47,9 @@ stdenv.mkDerivation rec { preConfigure = "cd dev"; enableParallelBuilding = true; - passthru.tests = { - can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + passthru = { + tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + updateScript = unstableGitUpdater { }; }; meta = with stdenv.lib; { @@ -63,4 +65,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 1f5c6a3d4c4..664ceb79636 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.11.10"; + version = "2020.12.01"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "cf331ca2a7fa92d3414fabf003ce6fc7b515f76b"; - sha256 = "0ka8ncfq3v8v70m3gwb3nd2rb39sy4vz0lx9hi277cbdsprmf55j"; + rev = "868902fbdf0b476bdccf4d25cbb80ba602d2cc11"; + sha256 = "1kb5lhixb7f4q800gjyw9xm9ff1yaq3pgna17f5f0bw6b4ds56zc"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 87170749656..436b03e499c 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -25,4 +25,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1fd3bbaba92..dab1f2a6bd8 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,4 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget -, targetPackages , fetchurl, file, python3 , llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl @@ -93,8 +92,12 @@ in stdenv.mkDerivation rec { "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins + ] ++ optionals stdenv.buildPlatform.isMusl [ + "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" + ] ++ optionals stdenv.hostPlatform.isMusl [ + "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ - "${setTarget}.musl-root=${targetPackages.stdenv.cc.libc}" + "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index c7266614e49..7ae16a77a26 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, autoPatchelfHook , ncurses5, zlib, gmp +, makeWrapper +, less }: stdenv.mkDerivation rec { @@ -23,12 +25,13 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - nativeBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = [ makeWrapper ] ++ (stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook); buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; installPhase = '' mkdir -p $out/bin mv ucm $out/bin + wrapProgram $out/bin/ucm --prefix PATH ":" "${stdenv.lib.makeBinPath [ less ]}"; ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index f34c4fb7fe1..b16d76304e4 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+3675"; + version = "0.9+3715"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "71ca9a825309635511b64b3ec40e5e5e9b6ad49b"; - sha256 = "03jlhfvm5rxx8yybf94nqd3ld2y6brp8r0k6gfi56chv3iqqavy3"; + rev = "d021f4b4003bb7a374038134c65edd3f67473a92"; + sha256 = "0dgdpigqg8mwkry4233p6z6myjnrb1rq32873yhdfwvwqq230x51"; }; enableParallelBuilding = true; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index f24ccaf427d..e0ca5208620 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchFromGitHub, coq }: - -let params = - { - "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; - "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; - "8.8" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.9" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.10" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.11" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.12" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; +{ stdenv, fetchFromGitHub, coq, ...}@args: + +let + hashes = { + "0.9.4" = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; + "0.9.5" = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; + "0.9.7" = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; + "0.10.0" = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; + "0.10.1" = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; + "0.10.2" = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; + "0.10.3" = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; + "0.11.1" = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; + "0.11.2" = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; + "0.11.3" = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; }; - param = params.${coq.coq-version}; + + default-versions = { + "8.5" = "0.9.4"; + "8.6" = "0.9.5"; + "8.7" = "0.9.7"; + "8.8" = "0.11.3"; + "8.9" = "0.11.3"; + "8.10" = "0.11.3"; + "8.11" = "0.11.3"; + "8.12" = "0.11.3"; + }; + + param = rec { + version = args.version or default-versions.${coq.coq-version}; + sha256 = hashes.${version}; + }; + in stdenv.mkDerivation rec { @@ -20,9 +38,9 @@ stdenv.mkDerivation rec { inherit (param) version; src = fetchFromGitHub { - owner = "coq-ext-lib"; + owner = "coq-community"; repo = "coq-ext-lib"; - rev = "v${param.version}"; + rev = "v${version}"; inherit (param) sha256; }; @@ -40,6 +58,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: builtins.hasAttr v default-versions; }; } diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 000932cc010..8864e014c6d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"; + sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 0c182b25d57..7fe1b46e3a5 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -14,12 +14,17 @@ lib.makePackageOverridable , src , # The file to import, relative to the root directory file ? "package.dhall" + # Set to `true` to generate documentation for the package + , document ? false }: - buildDhallPackage { - inherit name dependencies source; + buildDhallPackage + ( { inherit name dependencies source; - code = "${src}/${file}"; - } + code = "${src}/${file}"; + + } + // lib.optionalAttrs document { documentationRoot = src; } + ) ) diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix index bdb958fb8bd..0978e47754b 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -12,6 +12,8 @@ lib.makePackageOverridable directory ? "" , # The file to import, relative to the above directory file ? "package.dhall" + # Set to `true` to generate documentation for the package + , document ? false # Arguments passed through to `fetchFromGitHub` , owner @@ -22,29 +24,32 @@ lib.makePackageOverridable , ... }@args: - buildDhallPackage { - inherit name dependencies source; - - code = - let - src = fetchFromGitHub ({ - name = "${name}-source"; - - inherit owner repo rev; - } // removeAttrs args [ - "name" - "dependencies" - "source" - "directory" - "file" - "owner" - "repo" - "rev" - ]); - - prefix = lib.optionalString (directory != "") "${directory}/"; - - in - "${src}/${prefix}${file}"; - } + let + src = fetchFromGitHub ({ + name = "${name}-source"; + + inherit owner repo rev; + } // removeAttrs args [ + "name" + "dependencies" + "document" + "source" + "directory" + "file" + "owner" + "repo" + "rev" + ]); + + prefix = lib.optionalString (directory != "") "${directory}/"; + + in + buildDhallPackage + ( { inherit name dependencies source; + + code = "${src}/${prefix}${file}"; + } + // lib.optionalAttrs document + { documentationRoot = "${src}/${prefix}"; } + ) ) diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 9303244eb88..039c50f0693 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -1,4 +1,4 @@ -{ dhall, haskell, lib, lndir, runCommand, writeText }: +{ dhall, dhall-docs, haskell, lib, lndir, runCommand, writeText }: { name @@ -31,6 +31,12 @@ # space within the Nix store, but if you set the following `source` option to # `true` then the package will also include `source.dhall`. , source ? false + + # Directory to generate documentation for (i.e. as the `--input` option to the + # `dhall-docs` command.) + # + # If `null`, then no documentation is generated. +, documentationRoot ? null }: let @@ -42,8 +48,12 @@ let cache = ".cache"; + data = ".local/share"; + cacheDhall = "${cache}/dhall"; + dataDhall = "${data}/dhall"; + sourceFile = "source.dhall"; in @@ -71,4 +81,10 @@ in echo "missing $SHA_HASH" > $out/binary.dhall ${lib.optionalString (!source) "rm $out/${sourceFile}"} + + ${lib.optionalString (documentationRoot != null) '' + mkdir -p $out/${dataDhall} + + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs + ''} '' diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 8190dc0f29f..02992e71871 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,32 +1,41 @@ -{ stdenv, fetchFromGitHub -, libX11, libXt +{ stdenv +, fetchFromGitHub +, libX11 +, libXt , withGraphics ? true }: stdenv.mkDerivation rec { pname = "icon-lang"; - version = "9.5.20i"; - + version = "unstable-2020-02-05"; src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; - rev = "v${version}"; - sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s"; + rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7"; + sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; - configurePhase = let - target = if withGraphics then "X-Configure" else "Configure"; - platform = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" - else throw "unsupported system"; - in "make ${target} name=${platform}"; + configurePhase = + let + target = if withGraphics then "X-Configure" else "Configure"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macintosh" + else if stdenv.isBSD then "bsd" + else if stdenv.isCygwin then "cygwin" + else if stdenv.isSunOS then "solaris" + else throw "unsupported system"; + in + "make ${target} name=${platform}"; - installPhase = "make Install dest=$out"; + installPhase = '' + make Install dest=$out + rm $out/README + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/icon + ''; meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix new file mode 100644 index 00000000000..ded661e5585 --- /dev/null +++ b/pkgs/development/interpreters/php/8.0.nix @@ -0,0 +1,17 @@ +{ callPackage, lib, stdenv, nixosTests, ... }@_args: + +let + generic = (import ./generic.nix) _args; + + base = callPackage generic (_args // { + version = "8.0.0"; + sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy"; + }); + +in base.withExtensions ({ all, ... }: with all; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp iconv intl ldap mbstring mysqli mysqlnd opcache + openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql + posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib +] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/pkgs/development/interpreters/php/fix-opcache-configure.patch b/pkgs/development/interpreters/php/fix-opcache-configure.patch new file mode 100644 index 00000000000..e67d2cc7bc7 --- /dev/null +++ b/pkgs/development/interpreters/php/fix-opcache-configure.patch @@ -0,0 +1,81 @@ +diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 +index 726188597496..781e51d3e44c 100644 +--- a/Zend/Zend.m4 ++++ b/Zend/Zend.m4 +@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS + dnl + AC_DEFUN([LIBZEND_OTHER_CHECKS],[ + +-AC_ARG_ENABLE([zts], +- [AS_HELP_STRING([--enable-zts], +- [Enable thread safety])], +- [ZEND_ZTS=$enableval], +- [ZEND_ZTS=no]) +- + AC_MSG_CHECKING(whether to enable thread-safety) + AC_MSG_RESULT($ZEND_ZTS) + +diff --git a/configure.ac b/configure.ac +index 8d6e922fa9bf..e07a75d19ac7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then + ZEND_DEBUG=yes + fi + ++AC_ARG_ENABLE([zts], ++ [AS_HELP_STRING([--enable-zts], ++ [Enable thread safety])], ++ [ZEND_ZTS=$enableval], ++ [ZEND_ZTS=no]) ++ ++if test "$ZEND_ZTS" = "yes"; then ++ AC_DEFINE(ZTS, 1,[ ]) ++ PHP_THREAD_SAFETY=yes ++else ++ PHP_THREAD_SAFETY=no ++fi ++ + PHP_ARG_ENABLE([rtld-now], + [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], + [AS_HELP_STRING([--enable-rtld-now], +@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS + LIBZEND_DLSYM_CHECK + LIBZEND_OTHER_CHECKS + +-if test "$ZEND_ZTS" = "yes"; then +- AC_DEFINE(ZTS,1,[ ]) +- PHP_THREAD_SAFETY=yes +-else +- PHP_THREAD_SAFETY=no +-fi +- + INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" + INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" + +diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 +index 054cd28c0247..93d72fb73d19 100644 +--- a/ext/opcache/config.m4 ++++ b/ext/opcache/config.m4 +@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then + esac + fi + +- if test "$enable_zts" = "yes"; then ++ if test "$PHP_THREAD_SAFETY" = "yes"; then + DASM_FLAGS="$DASM_FLAGS -D ZTS=1" + fi + +diff --git a/ext/session/config.m4 b/ext/session/config.m4 +index 7abc8813b72a..da31bbde86cc 100644 +--- a/ext/session/config.m4 ++++ b/ext/session/config.m4 +@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then + AC_MSG_ERROR(cannot find mm library) + fi + +- if test "$enable_zts" = "yes"; then ++ if test "$PHP_THREAD_SAFETY" = "yes"; then + dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. + AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) + fi \ No newline at end of file diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 6f0f5c40120..4a96abcf9b6 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -198,7 +198,8 @@ let ++ lib.optional (!ipv6Support) "--disable-ipv6" ++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional ztsSupport "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" # Sendmail diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 0b753618ba6..37d8859ba50 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 45f27b38a63..820e7383246 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.12.11"; + version = "0.13.1"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-bCDyMwQdn9Csxs2hy4dm+LjtxK4+YBK6yDkAdhu1QVU="; + sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 0b204746649..0f99484f5a0 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.6"; + version = "4.4.13"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1vlvnpkks5mm6ppdmp88mdn39f3ynig6qas83nkjn7x47z2zr6x0"; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 086f6472ee0..87f9698bec0 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.3.0"; + version = "0.5.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1f7hfwik7a9kzw0q1k3xc1yisrgg8lbp5pjr337phc9hm38lhq3c"; + sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 4130d8cf8b9..43dbe676569 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.1"; + version = "20.4.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1axklxzv85flhv41s8nmp7m4kswnav6qpg8w9przac9ji07rknwl"; + sha256 = "1nz0f2chfm3rr8aggb7md0cmikwpd9159ql1rc59208nvl2fshrb"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index b074cba5c81..eca7170bfff 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.8"; + version = "4.3.10"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "1cgpk1v8wgsdyl2gx1bk1nrqflc17ciy0wdg3rgzgy0avl4yghww"; + sha256 = "0yy6sq4rvv9c0f09vljnqx92zvr39bn1spl735hzn6253d7fm3a5"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix new file mode 100644 index 00000000000..3875ff91185 --- /dev/null +++ b/pkgs/development/libraries/libcork/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, cmake +, lib +, pkg-config +, check +}: +stdenv.mkDerivation rec { + pname = "libcork"; + version = "1.0.0--rc3"; + + src = fetchFromGitHub { + owner = "dcreager"; + repo = pname; + rev = version; + sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; + }; + + # N.B. We need to create this file, otherwise it tries to use git to + # determine the package version, which we do not want. + # + # N.B. We disable tests by force, since their build is broken. + postPatch = '' + echo "${version}" > .version-stamp + echo "${version}" > .commit-stamp + sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ check ]; + + doCheck = false; + + postInstall = '' + ln -s $out/lib/libcork.so $out/lib/libcork.so.1 + ''; + + meta = with lib; { + homepage = "https://github.com/dcreager/libcork"; + description = "A simple, easily embeddable cross-platform C library"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index cc4e7dfefee..469633afb10 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.3"; + version = "1.90.4"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "1fs0qrfrqnvc6kcsg81l5p89n8jnsx9dr1pzxpb8ghwas8c9v52i"; + sha256 = "0grhck0h29i7hm7npvby7pn7wdc446kv0r4mkpbssp46lqbjb96b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 47408f8cb6f..dcbb71c7c3a 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { devices to the Linux Desktop. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 59f09c8d253..5b0b60b16b3 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21; # Upstream description says it works on more platforms, but packager hasn't tried that yet - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 83ee19075de..0cb233ad271 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -5,6 +5,9 @@ , pkgconfig , vala , gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , glib , libgudev , libevdev @@ -13,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.5"; + version = "0.2.6"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gAbghIDAy9T3SewVWCfRAER88jkD+tgkCnxMMhqgmis="; + sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"; }; nativeBuildInputs = [ @@ -28,6 +31,9 @@ stdenv.mkDerivation rec { pkgconfig vala gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ @@ -36,6 +42,10 @@ stdenv.mkDerivation rec { libevdev ]; + mesonFlags = [ + "-Ddoc=true" + ]; + doCheck = true; passthru = { @@ -46,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple GObject game controller library"; - homepage = "https://gitlab.gnome.org/aplazas/libmanette"; + homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 6608ccd1abc..a626e7a5377 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index f4c4dbfcf71..9d81c5d0fbe 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 9e38f1e828d..f0c4c47db03 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0xcra2hcsm88rfd7zf52hccx3nvg9j65a595z7c0lrzv6jz04676"; + sha256 = "0znhv7x81bvqijk5xhc5w760d5yy6vr5c2y271wpk9lkmxbbcpl1"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 9b7d80a2240..55b2f0ff186 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0"; + hash = "sha256-P36JKFgXSZagWzHB6WB2WlDu7jkVvfYVo1BaV0b8iEk="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 7a122fae39e..e6546e0d336 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14"; + hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M="; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 4dd96c2c7d9..54c7cb9a10b 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090"; + hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 69ca18318ac..4681267da18 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv"; + hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index d3e113b8ded..4df954f4b25 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6"; + hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 63e66f35f81..bf0a05fe73e 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj"; + hash = "sha256-FLH+GHXA0zepbR1wPPSez/hx1hiG2kkCTneDKhJJRjU="; }; preConfigure = '' diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9787c7e92da..2022ec7caaa 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,12 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; + cmakeFlags = [ + "-DSPDLOG_BUILD_SHARED=ON" + "-DSPDLOG_BUILD_EXAMPLE=OFF" + "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON" + ]; outputs = [ "out" "doc" ]; @@ -24,6 +29,9 @@ let cp -rv ../example $out/share/doc/spdlog ''; + doCheck = true; + preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; + meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix deleted file mode 100644 index d0100edd345..00000000000 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl }: - -let - archiveVersion = import ./archive-version.nix stdenv.lib; -in - -stdenv.mkDerivation rec { - pname = "sqlite-analyzer"; - version = "3.33.0"; - - src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; - - makeFlags = [ "sqlite3_analyzer" ]; - - installPhase = "install -Dt $out/bin sqlite3_analyzer"; - - meta = with stdenv.lib; { - description = "A tool that shows statistics about SQLite databases"; - downloadPage = "http://sqlite.org/download.html"; - homepage = "https://www.sqlite.org"; - license = licenses.publicDomain; - maintainers = with maintainers; [ pesterhazy ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 165506f9647..1a36a68a33b 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,20 +1,16 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: stdenv.mkDerivation rec { - version = "unstable-2020-10-25"; + version = "1.7.0"; pname = "tdlib"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 (here called `unstable-2020-10-25`) uses an - # explicit revision because 1.6.9 is not a tdlib GitHub release, and is therefore not hosted at - # `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please return to the `rev = "v${version}"` style on the next - # version bump if you can, since that will allow `nixpkgs-update` to update the package automatically. - rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01"; + rev = "v${version}"; - sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n"; + sha256 = "sha256-sZzp9k7KDnqftcSGSgXkIy0siCksGPBmRckySU/J0TU="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix new file mode 100644 index 00000000000..92eb5b3d8f4 --- /dev/null +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tinyobjloader"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "tinyobjloader"; + repo = "tinyobjloader"; + rev = "v${version}"; + sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tinyobjloader/tinyobjloader"; + description = "Tiny but powerful single file wavefront obj loader"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 908b4896845..c8694a46bd1 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -59,6 +59,10 @@ let buildInputs = [ pkgs.phantomjs2 ]; }; + flood = super.flood.override { + buildInputs = [ self.node-pre-gyp ]; + }; + expo-cli = super."expo-cli".override (attrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8604015d88b..e2a2110fa6f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -80,6 +80,7 @@ , {"fast-cli": "1.x"} , "fauna-shell" , "fkill-cli" +, "flood" , "forever" , "fx" , "get-graphql-schema" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1c88382c29b..d1ead03f592 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1381,22 +1381,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.5.1" = { + "@bugsnag/browser-7.5.3" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.5.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.1.tgz"; - sha512 = "NLWgSj3elYGSkdth666UxQ6r5Y/zAMidnQZRnOW2ZsW+4W/q+hr7zoN4v5IUnZuoSTQ9QxVYY99wA4hqlDyoJg=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.3.tgz"; + sha512 = "iGmKFtHz91hNovWW8rb/qLD9X5TMVEc7OUEfwE5s1M8ElReEmUAVbgTfQjkahG8aHvjGQ+M+zyM0gHfk+tTczg=="; }; }; - "@bugsnag/core-7.3.5" = { + "@bugsnag/core-7.5.3" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.3.5"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.5.tgz"; - sha512 = "7zKFLcA6m9aaQ1p1AQx2iRaT3gE/MJqy0vGa/RhlKNdgMdMKYRGECWxJE66firvJT5ZwL7Bu11IkK6sLWHCBaw=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.3.tgz"; + sha512 = "HaAPWN+z3ZlEjwF2JeuAx83eKoVd6osgx2Hyn8dlmGsRfUvpi+7rG9DI483PGexEM0O6i/ORvD6Qx92/E9zW7w=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1408,22 +1408,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.5.1" = { + "@bugsnag/js-7.5.3" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.5.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.1.tgz"; - sha512 = "acbq392QYjZNtUHa5tTp+MLTBhNZhI4s6EBrEFqN1TdxrVVGEFfnQqrPISfKtOJ+FW1dZEZiQ0oEGJ127htqIQ=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.3.tgz"; + sha512 = "xdwfq+bQPWZFwc02IIFk7rVsxoEsAMOLiZLJpjnRK/HtzwWPUciMTRIIlUzb/uZaAmd05UieVQ/TxuwQYdMgEA=="; }; }; - "@bugsnag/node-7.3.5" = { + "@bugsnag/node-7.5.3" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.3.5"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.5.tgz"; - sha512 = "eN06NgphKYikBq/AXpiLO9tNx1H7cz8C78oQnR5fj2POulj+Zm9njr9dM6DEzGIvBDt952SwwcOA73jAiOmztQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.3.tgz"; + sha512 = "irNGOTcxi7u8lUziLfv7rKzWGg2Yd+ZXZnwD0r6ZDhdlOwA3UnGq6Fud3SOTJNKPcUk/16Sv0mcuKkcLdHTodg=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1705,22 +1705,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.16" = { + "@expo/config-3.3.18" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.16"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.16.tgz"; - sha512 = "iEjyV8OfaA0fPPsKYkkcod6wCd6sAtWOxAAT+7xriGqJV5aYnpL1hcBxPkPKavYzWMJUEEOwajmqoJy1uVP6ig=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.18.tgz"; + sha512 = "R78HOWnLcxdip3FBrfbxti+85jdoRNpXV0Eihb6dl+sBRNo4+uzBNEQQ1P7ICoTzrehdkhdXkQYflvQFuQXyAA=="; }; }; - "@expo/config-plugins-1.0.3" = { + "@expo/config-plugins-1.0.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.3.tgz"; - sha512 = "Tc17MLfNIHl7h+YmE4cEvIK4WZq5fFShdrXJGNoNmubJ6xPeqDTLL7qCVNSzckkU4+XgfV1qt5uU+qezZLvbCw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.5.tgz"; + sha512 = "ykEHIZu7Xjnq7wgauXw0cSbo9C2SVvDmCRwyAJoReJ88R0xXOt+4GQJ6BYdmGv9Gmdt6DTrWqwMQOJK6GmoMew=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1741,22 +1741,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.41" = { + "@expo/dev-server-0.1.43" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.41"; + version = "0.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.41.tgz"; - sha512 = "Mgqm79SE01bXiOG5DsJyuP/FAszkGKC22rfvjGb0tCVHbcvuVLjxm2fnnylBj9FRcTW6Rz3hAB1RaC5RayqNcg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.43.tgz"; + sha512 = "FYLMoI7c1Myw5vCyx7nMEW6Oos40wx28TuHcticKPU+zZiYrzyIa4aJzEv4bWnw1if6417lKXjncYvQEZRyxFw=="; }; }; - "@expo/dev-tools-0.13.62" = { + "@expo/dev-tools-0.13.65" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.62"; + version = "0.13.65"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.62.tgz"; - sha512 = "6DeV6VxdJFPz7xYwNgIvb5GGRweHC9dS/XkkKic7Nm0c8FV+BPEm0Z/JThJ76fliTFiUPB6L7hNNCLbzObW9Zw=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.65.tgz"; + sha512 = "LhfxPzJuKPi3WlK5C5o9ejJOkscU6pCqHKRWI97zN8Xh6XJ6FMNfqgh+hJ94vqWAMmDpEBjY3e7MxZXqQaNaAQ=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1786,13 +1786,13 @@ let sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; }; }; - "@expo/metro-config-0.1.41" = { + "@expo/metro-config-0.1.43" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.41"; + version = "0.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.41.tgz"; - sha512 = "eq2FT7/KCwQSW5R5iMLu2a8amwZ7Oz3tUIKWZtbpj6LCPbRyrF+htnjsO1eIQJ02QDE1HIs2cxFeUHjoWJSh7g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.43.tgz"; + sha512 = "ZkZXu2dVjZ88tiH51gqM3DUAmey18tM9MlDh91r1iLF6hHT6UeZD0lBDN7IJTQv/SJuAPQHoylXmAx6cuIGU9A=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1993,22 +1993,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.46" = { + "@expo/webpack-config-0.12.48" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.46"; + version = "0.12.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.46.tgz"; - sha512 = "lVOmaBAKrw2PO1TsEOkeCFLLxGuWcoHpAeN/SgVKcQCKZuSAYqTG5qf4Rino7TdVjbCOu+Apec4AIyg2oW6Y8w=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.48.tgz"; + sha512 = "uUmr+z9gpMNw6yUGinQkkN/GDPypLvySs/0pwUBF9w7xfaGeRKoEGYhNS8JaIXgmR3621eKi3F2pBlSoSFfiew=="; }; }; - "@expo/xdl-59.0.2" = { + "@expo/xdl-59.0.5" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.2"; + version = "59.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.2.tgz"; - sha512 = "hTwJkac/+y5arWDZnQCb3lbOsgiz5tyY+ikr1LHcO8emiPpctY98H9v7MKwsxu6GsXfmwrztqgtkVBRviKh56A=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.5.tgz"; + sha512 = "JWQDKG+Eymgwm3xd2OAkTSpb3fgNetQFJHGZt4/2GUfqjQuyFWZMtmtKwJ2ZDaW+V8tNW0hgR5czWI/lsZSZnA=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2146,13 +2146,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.5" = { + "@graphql-tools/delegate-7.0.7" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.5"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.5.tgz"; - sha512 = "wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.7.tgz"; + sha512 = "2sze+CJxu37b4jcQ4fyj6ap9TMnx8+NBtApSs1nWIVENzPE2510aNTsBHgSdTwSeV/tVIFkAtZZAlMEGYGXzQA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.6" = { @@ -2191,22 +2191,22 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.5" = { + "@graphql-tools/merge-6.2.6" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.5.tgz"; - sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz"; + sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug=="; }; }; - "@graphql-tools/schema-7.1.0" = { + "@graphql-tools/schema-7.1.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.0.tgz"; - sha512 = "1TwaRfWOfxtTqk8ckBrLi3283Sl0tQmUleAnelID1mql4YgYyArrKRkHfWZs9DbydngTxj/uV10aLYioJMR6tQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.2.tgz"; + sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; }; }; "@graphql-tools/url-loader-6.4.0" = { @@ -2227,22 +2227,22 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.1.0" = { + "@graphql-tools/utils-7.1.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.0.tgz"; - sha512 = "lMTgy08BdqQ31zyyCRrxcKZ6gAKQB9amGKJGg0mb3b4I3iJQKeaw9a7T96yGe1frGak1UK9y7OoYqx8RG7KitA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.2.tgz"; + sha512 = "xFuhDyGMhaXTQpq48vjjCLA1VWc3fEo4n+zBcvQnbBSqhVPwAVa0ANcpb0NHmU9c3ypch26kK85TmC/HoK3YRg=="; }; }; - "@graphql-tools/wrap-7.0.1" = { + "@graphql-tools/wrap-7.0.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.1.tgz"; - sha512 = "0feqjgEJSRLm2V0kEUaV2dw7ukVPjRujYMqNdcqHsIyXmf0VO8PGF5hcva/+5U/9Yfbf3Fck+P5JTJ5MlXPlsQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.3.tgz"; + sha512 = "co+ELAwZwMut7qGZow8ATMQlYOU2G3/gsEqz/SUAt7XizXWOOguSFjQKk1/OwHzgCFBbEjvwfoERcv6QC1EUxA=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -3406,13 +3406,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.136" = { + "@microsoft/load-themed-styles-1.10.138" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.136"; + version = "1.10.138"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.136.tgz"; - sha512 = "D8wWUiW7HQKFp4Qgy5GsDvEymKew/4uK+4dSWSO/+6LfSI15kqDNS7g4Nf/VxL5FBmjwXqQV1d59ucgWiKUjJg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.138.tgz"; + sha512 = "TDY8c3CnIbysFIQ8Lj/ZujLkvDB/jrnVOx6FDJICFfo1Jbcyia+nIbUkOJtXtTGK/sx/zfyYJxgFgKQEAtKLHQ=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3460,13 +3460,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.3.3" = { + "@netlify/build-5.5.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.3.3"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.3.tgz"; - sha512 = "PgAPLFZeHeR45mM2km/UHXfg/3K9NtrGKAaoG7vwU36XYEaVaB/psBp0PzrfJbRiBER+vqnxrDTOyHJc4Z0w1g=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.5.2.tgz"; + sha512 = "599fcS/FVJUMjnF5NS0QGwZ6B8uw7ROL50z6VfrHbdgpcHgoSCo3HNHeeIA6bfA4pO/IdnmRFOX4fDJgKPsbLw=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3487,13 +3487,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.4.0" = { + "@netlify/config-2.4.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.0.tgz"; - sha512 = "MDp7A7AMHVOHpvX+o69t+c8nZjVtkxNcepxsSqE+9wuPVlSHWCqzkHVxKQU0ozuk74z/xHBRUpp/OMCXkiEugg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.1.tgz"; + sha512 = "fSRSN3+c5kcyaCEd7XVlPRz820y/CRS8ryuE2fZAT/sgXiGBPGGKHwSKMNlso7s0qtJOmFyjeehU6nEzvfNKrg=="; }; }; "@netlify/functions-utils-1.3.2" = { @@ -3532,6 +3532,15 @@ let sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; }; }; + "@netlify/plugins-list-2.0.0" = { + name = "_at_netlify_slash_plugins-list"; + packageName = "@netlify/plugins-list"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.0.0.tgz"; + sha512 = "GU0u0fnVqNTU32hVr7ig7bGG3/851a0SNjC9nl+iu4Eadax/hfCVSRoSffU0+d05UtXlLhkcgmuYnLySkTR8DA=="; + }; + }; "@netlify/run-utils-1.0.5" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; @@ -3577,13 +3586,13 @@ let sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; }; }; - "@netlify/zip-it-and-ship-it-1.4.2" = { + "@netlify/zip-it-and-ship-it-1.5.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.2.tgz"; - sha512 = "iwwKQrBnLONYm1x7g6GZvHmjeZ03/L2NUYL/2NcpNYtE4sWB+M5OTDdnlVsu8u65dR7wtH4hKjOO2ID6vS7rQQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.5.0.tgz"; + sha512 = "hTUVtCdjrWso28Lwi+A9GO+WZhVJcJWvXO0YuYlBcGY67Lv61TQQl7nNvzgGYG7UNnzvsnTafe1pL2v+4u4vmg=="; }; }; "@node-red/editor-api-1.2.6" = { @@ -3892,22 +3901,31 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.3" = { + "@octokit/auth-token-2.4.4" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.3.tgz"; - sha512 = "fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz"; + sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q=="; }; }; - "@octokit/endpoint-6.0.9" = { + "@octokit/endpoint-6.0.10" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.9.tgz"; - sha512 = "3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz"; + sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q=="; + }; + }; + "@octokit/openapi-types-1.2.2" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-1.2.2.tgz"; + sha512 = "vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3946,13 +3964,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.10" = { + "@octokit/request-5.4.11" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.10"; + version = "5.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.10.tgz"; - sha512 = "egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.11.tgz"; + sha512 = "vskebNjuz4oTdPIv+9cQjHvjk8vjrMv2fOmSo6zr7IIaFHeVsJlG/C07MXiSS/+g/qU1GHjkPG1XW3faz57EoQ=="; }; }; "@octokit/request-error-1.2.1" = { @@ -3964,13 +3982,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.3" = { + "@octokit/request-error-2.0.4" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.3.tgz"; - sha512 = "GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz"; + sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA=="; }; }; "@octokit/rest-16.43.2" = { @@ -3991,13 +4009,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.5.0" = { + "@octokit/types-6.0.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.5.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz"; - sha512 = "UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.0.1.tgz"; + sha512 = "H/DnTKC+U09en2GFLH/MfAPNDaYb1isieD4Hx4NLpEt/I1PgtZP/8a+Ehc/j9GHuVF/UvGtOVD8AF9XXvws53w=="; }; }; "@opencensus/core-0.0.8" = { @@ -4585,13 +4603,13 @@ let sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; }; }; - "@rollup/plugin-babel-5.2.1" = { + "@rollup/plugin-babel-5.2.2" = { name = "_at_rollup_slash_plugin-babel"; packageName = "@rollup/plugin-babel"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz"; - sha512 = "Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A=="; + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.2.tgz"; + sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA=="; }; }; "@rollup/plugin-commonjs-13.0.2" = { @@ -4900,22 +4918,22 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@snyk/cli-interface-2.9.1" = { + "@snyk/cli-interface-2.11.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.9.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.1.tgz"; - sha512 = "2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz"; + sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cli-interface-2.9.2" = { + "@snyk/cli-interface-2.9.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.9.2"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz"; - sha512 = "C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.1.tgz"; + sha512 = "2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA=="; }; }; "@snyk/cocoapods-lockfile-parser-3.5.2" = { @@ -5143,13 +5161,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-1.1.6" = { + "@tencent-sdk/capi-1.1.8" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.6.tgz"; - sha512 = "3Ietq/r8B/CQu94qXr4YrNE79p5emhtMI6szHh/cD9xz1/6OOUwW/agcCO1748v94jjxOFEspAvva6jGVriuGA=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.8.tgz"; + sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -5872,13 +5890,13 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; - "@types/jscodeshift-0.7.1" = { + "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.1.tgz"; - sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; + url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.2.tgz"; + sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; "@types/json-schema-7.0.6" = { @@ -6088,13 +6106,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.47" = { + "@types/node-10.17.48" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.47"; + version = "10.17.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.47.tgz"; - sha512 = "YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.48.tgz"; + sha512 = "Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag=="; }; }; "@types/node-12.7.12" = { @@ -6106,13 +6124,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.33" = { + "@types/node-13.13.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.33"; + version = "13.13.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.33.tgz"; - sha512 = "1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.34.tgz"; + sha512 = "g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug=="; }; }; "@types/node-14.11.1" = { @@ -10030,13 +10048,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.799.0" = { + "aws-sdk-2.800.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.799.0"; + version = "2.800.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz"; - sha512 = "NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.800.0.tgz"; + sha512 = "1vxT8h2iFFaxfn+onMIdL/L+OcIG6G4BUzRt4wuvQzwbKArRy0fUN2d6E7aoM74wl8VlNIMTxBLCqxDnfVeVxQ=="; }; }; "aws-sign2-0.6.0" = { @@ -13099,13 +13117,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001161" = { + "caniuse-lite-1.0.30001164" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001161"; + version = "1.0.30001164"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; - sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz"; + sha512 = "G+A/tkf4bu0dSp9+duNiXc7bGds35DioCyC6vgK2m/rjA4Krpy5WeZgZyfH2f0wj2kI6yAWWucyap6oOwmY1mg=="; }; }; "canvas-2.6.1" = { @@ -19877,13 +19895,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.610" = { + "electron-to-chromium-1.3.612" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.610"; + version = "1.3.612"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; - sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.612.tgz"; + sha512 = "CdrdX1B6mQqxfw+51MPWB5qA6TKWjza9f5voBtUlRfEZEwZiFaxJLrhFI8zHE9SBAuGt4h84rQU6Ho9Bauo1LA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -19923,13 +19941,13 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elf-tools-1.1.2" = { - name = "elf-tools"; - packageName = "elf-tools"; - version = "1.1.2"; + "elf-cam-0.1.1" = { + name = "elf-cam"; + packageName = "elf-cam"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elf-tools/-/elf-tools-1.1.2.tgz"; - sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; + url = "https://registry.npmjs.org/elf-cam/-/elf-cam-0.1.1.tgz"; + sha512 = "tKSFTWOp5OwJSp6MKyQDX7umYDkvUuI8rxHXw8BuUQ63d9Trj9xLeo6SHyoTGSoZNNZVitFa+RuHHXuoAzN3Rw=="; }; }; "elfy-1.0.0" = { @@ -21670,13 +21688,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.52" = { + "expo-pwa-0.0.54" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.52"; + version = "0.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.52.tgz"; - sha512 = "LzpcL/nzFrBJqCCEaDOmWx4BfvmQFhAetUSG8/WcyMcTvqTC/WlboK+mlSj0mN5vw1/H/UCMqj6GoT07QIaUWQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.54.tgz"; + sha512 = "UQtnB/CrjkUfQrRyHmUi3jg/1++fkM2KHTy5DBrexTC0XoXzbJCLMrUTgH2VBtjIVQO9KyApInE53BRcz3ei+Q=="; }; }; "express-2.5.11" = { @@ -24074,6 +24092,15 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; + "geoip-country-4.0.44" = { + name = "geoip-country"; + packageName = "geoip-country"; + version = "4.0.44"; + src = fetchurl { + url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.44.tgz"; + sha512 = "nC8TqPY7k6ig956peHrNJdjc5bWcIlURKQJKUwq1HdSlgxa4UvGTbbI+9NqxsUZ5Ozgp6NPa5qSU5GMa502kmg=="; + }; + }; "get-amd-module-type-3.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; @@ -24713,13 +24740,13 @@ let sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; }; }; - "global-4.3.2" = { + "global-4.4.0" = { name = "global"; packageName = "global"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; - sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz"; + sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; }; }; "global-agent-2.1.12" = { @@ -26992,6 +27019,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "iconv-lite-0.5.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; + }; + }; "iconv-lite-0.6.2" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -27865,6 +27901,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-address-6.4.0" = { + name = "ip-address"; + packageName = "ip-address"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-6.4.0.tgz"; + sha512 = "c5uxc2WUTuRBVHT/6r4m7HIr/DfV0bF6DvLH3iZGSK8wp8iMwwZSgIq2do0asFf8q9ECug0SE+6+1ACMe4sorA=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -28099,13 +28144,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.0" = { + "is-bigint-1.0.1" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz"; - sha512 = "t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz"; + sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; }; }; "is-binary-path-1.0.1" = { @@ -29809,13 +29854,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.0" = { + "jquery.terminal-2.20.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.0"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.0.tgz"; - sha512 = "8Wq9i5mwj8MnkFHEFZebn+l4K4HEsRXSanrQwq/u6lEP39/44b1vJzmYsqJLq57JALrY6Cp9b5fC4hMlWhi1Zw=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz"; + sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA=="; }; }; "js-base64-2.6.4" = { @@ -30367,6 +30412,15 @@ let sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; }; }; + "jsonc-parser-3.0.0" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"; + sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -32501,6 +32555,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; + }; + }; "lodash.findkey-4.6.0" = { name = "lodash.findkey"; packageName = "lodash.findkey"; @@ -32843,6 +32906,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.max-4.0.1" = { + name = "lodash.max"; + packageName = "lodash.max"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; + sha1 = "8735566c618b35a9f760520b487ae79658af136a"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -36461,13 +36533,13 @@ let sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; }; }; - "nanoid-3.1.18" = { + "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.18"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; - sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; "nanolru-1.0.0" = { @@ -36668,13 +36740,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.8" = { + "nearley-2.19.9" = { name = "nearley"; packageName = "nearley"; - version = "2.19.8"; + version = "2.19.9"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.8.tgz"; - sha512 = "te4JCrxbzLvVqUWfVOASgsbkWaFvJ6JlHTRQzfnU862bnyHGHEGX2s5OYvLAS4NDPmQvRtC2tBdV6THy6xHFyQ=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.9.tgz"; + sha512 = "KpCXvcVWPmZrEs95tIkqWi+CgL48O8CJDVDgY/AQGWXR1O8KQPHt5iQrTLior0k0v3PGKIV2xPi879wR1sawwg=="; }; }; "neat-csv-2.1.0" = { @@ -38327,13 +38399,13 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; - "object-inspect-1.8.0" = { + "object-inspect-1.9.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "object-is-1.1.4" = { @@ -42018,13 +42090,13 @@ let sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg=="; }; }; - "postcss-reporter-7.0.1" = { + "postcss-reporter-7.0.2" = { name = "postcss-reporter"; packageName = "postcss-reporter"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.1.tgz"; - sha512 = "R9AK80KIqqMb+lwGRBcRkXS7r96VCTxrZvvrfibyA/dWjqctwx7leHMCC05A9HbW8PnChwOWwrmISwp5HQu5wg=="; + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz"; + sha512 = "JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw=="; }; }; "postcss-resolve-nested-selector-0.1.1" = { @@ -42351,13 +42423,13 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; - "prettier-2.2.0" = { + "prettier-2.2.1" = { name = "prettier"; packageName = "prettier"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz"; - sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"; + sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; }; }; "prettier-bytes-1.0.4" = { @@ -42621,15 +42693,6 @@ let sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "process-0.5.2" = { - name = "process"; - packageName = "process"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; - sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; - }; - }; "process-es6-0.11.6" = { name = "process-es6"; packageName = "process-es6"; @@ -45006,13 +45069,13 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "redoc-2.0.0-rc.47" = { + "redoc-2.0.0-rc.48" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.47"; + version = "2.0.0-rc.48"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.47.tgz"; - sha512 = "weoRsJngABqWOuign5wXqVHLE0WRpODNQqwsZqtdKqCQ/paLxJRMBqSklAQdUnx4x5SEYvLxXatUGnw1mp2o4g=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.48.tgz"; + sha512 = "shArJWhNG2gQ0XKxW8WcfG8peNOtxbZ86CqxgrR9P7MnE5ESAo559CH/PSlezePeVLpcC0C9tcimOfSN5MaAvA=="; }; }; "reduce-component-1.0.1" = { @@ -46365,13 +46428,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.33.3" = { + "rollup-2.34.0" = { name = "rollup"; packageName = "rollup"; - version = "2.33.3"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; - sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.34.0.tgz"; + sha512 = "dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48381,13 +48444,13 @@ let sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.10.2" = { + "snyk-gradle-plugin-3.10.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.2.tgz"; - sha512 = "gTFKL0BLUN54asUQ4OIoa4lATGn27VZwWDJGQ0VuqSaaoy8I5W16Cbn/KN95oIKa7tgwrmasPLd5uviFWzo/Qw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.3.tgz"; + sha512 = "aFAqQu0vvgndxQtXxNfLzL9wamOwyRceRkSb+BXVp6E+Tpz4awksyUTfV0Yc5WjR0+hYB2rtBYKHXaK+GHficg=="; }; }; "snyk-module-1.9.1" = { @@ -49101,13 +49164,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.6" = { + "spdx-license-ids-3.0.7" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; "spdy-1.32.5" = { @@ -51477,13 +51540,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.6" = { + "systeminformation-4.30.10" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.6"; + version = "4.30.10"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.6.tgz"; - sha512 = "NV7zo9NU7fWSuiCORZmMLe90cFrrTS6jfalrQ0/5B7JGQ2ei15c2gmfICBwWdmviyv/FXAFVReySxOtDDkppqw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.10.tgz"; + sha512 = "BndDV7hjRomUGkHK6MO661KUUWcDRbr5SlepDvREidYnR2QJIyHln0iSysH9GPOT7YJgwtswdyg/up/ZFYxHrQ=="; }; }; "syswide-cas-5.3.0" = { @@ -53899,13 +53962,13 @@ let sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; }; }; - "uglify-js-3.12.0" = { + "uglify-js-3.12.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; - sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; + sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; }; }; "uglify-js-3.4.10" = { @@ -54493,13 +54556,13 @@ let sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-is-4.0.3" = { + "unist-util-is-4.0.4" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz"; - sha512 = "bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz"; + sha512 = "3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA=="; }; }; "unist-util-map-1.0.5" = { @@ -56375,13 +56438,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.5" = { + "vscode-css-languageservice-4.4.0" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.5.tgz"; - sha512 = "g9Pjxt9T32jhY0nTOo7WRFm0As27IfdaAxcFa8c7Rml1ZqBn3XXbkExjzxY7sBWYm7I1Tp4dK6UHXHoUQHGwig=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz"; + sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; "vscode-debugadapter-testsupport-1.42.0" = { @@ -56420,13 +56483,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.10.0" = { + "vscode-json-languageservice-3.11.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.10.0.tgz"; - sha512 = "8IvuRSQnjznu+obqy6Dy4S4H68Ke7a3Kb+A0FcdctyAMAWEnrORpCpMOMqEYiPLm/OTYLVWJ7ql3qToDTozu4w=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz"; + sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; "vscode-json-languageservice-3.8.4" = { @@ -58301,13 +58364,13 @@ let sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9"; }; }; - "xhr-2.5.0" = { + "xhr-2.6.0" = { name = "xhr"; packageName = "xhr"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; - sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; + url = "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz"; + sha512 = "/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA=="; }; }; "xml-1.0.1" = { @@ -58725,13 +58788,13 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; "y18n-5.0.5" = { @@ -59593,7 +59656,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -59638,7 +59701,7 @@ in sources."which-1.3.1" sources."wrappy-1.0.2" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -59967,7 +60030,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -60258,7 +60321,7 @@ in sources."browserslist-4.14.7" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -60279,7 +60342,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -60523,7 +60586,7 @@ in sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.47" + sources."@types/node-10.17.48" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60834,7 +60897,7 @@ in sources."@types/http-assert-1.5.1" sources."@types/http-errors-1.8.0" sources."@types/inquirer-6.5.0" - (sources."@types/jscodeshift-0.7.1" // { + (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" sources."recast-0.17.2" @@ -61088,7 +61151,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -61297,7 +61360,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61817,7 +61880,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object-treeify-1.1.30" @@ -62089,7 +62152,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -62333,7 +62396,7 @@ in sources."xmlbuilder-11.0.1" sources."xss-1.0.8" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { dependencies = [ @@ -63004,7 +63067,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -63163,7 +63226,7 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -63626,7 +63689,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -63676,7 +63739,7 @@ in sources."wordwrap-0.0.2" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-3.10.0" // { dependencies = [ @@ -63715,7 +63778,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -64040,7 +64103,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -64465,10 +64528,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.14"; + version = "1.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.14.tgz"; - sha512 = "vFv90gkUJr9xICYCT4NXFd1EQDGWjJfpcnHqTcgd8A8og5yKfL5cqoSxuwcT15nP4nx06sKBCmnkjMB2DPKn9g=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz"; + sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64483,10 +64546,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.8.0.tgz"; - sha512 = "HgdVA3F61GPN4sPxVNyeVWQd0p8oykchGgpovcX5QAVveAcWpUpxYXquX1y2B+EhBFZYNEOQVsr5zdVPzrko6w=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz"; + sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64615,7 +64678,7 @@ in sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -64694,10 +64757,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.19"; + version = "1.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.19.tgz"; - sha512 = "449bRHSru5ESxrWjgnizpI2OIXmzXN1/nEoPIkawJIsM4RvWAZJsMmsrgqweBRrQmyHy1sih7eIV3AkeZWbg7g=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.20.tgz"; + sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -64774,7 +64837,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -64871,7 +64934,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65310,7 +65373,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.2.0" + sources."prettier-2.2.1" sources."prettier-eslint-11.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -65449,7 +65512,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -65710,10 +65773,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.17.0.tgz"; - sha512 = "fL8O5Is3mvXiWPckw0vrGTldP8oMiNB8pjN/YGiDd/o5M8gQPc0N8a6urSByEHzEoFaV9hf7Lm0ZjK7muS0hjg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.18.0.tgz"; + sha512 = "26wqJFlLsKj2BWaFUfjuu7pIBob36HeUH131IPlxAvluxcd/uhIZZEm22DzBJFhiX6alP+6nHfKsjpI+ntyAtA=="; }; buildInputs = globalBuildInputs; meta = { @@ -65834,7 +65897,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -65872,7 +65935,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -66056,7 +66119,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { @@ -66081,7 +66144,7 @@ in sources."unified-9.2.0" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" @@ -66119,10 +66182,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.2.tgz"; - sha512 = "uxhcuQyjCmXse9ERkvyKpo7mEqC8wKGwREzbyFW92KAb+fB4YRBzmhrs7ws50cxSsYb6NPkfPrGsWqP4i0yEjg=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz"; + sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g=="; }; buildInputs = globalBuildInputs; meta = { @@ -66367,7 +66430,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" - sources."prettier-2.2.0" + sources."prettier-2.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -66497,7 +66560,7 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.1" sources."ms-2.0.0" - sources."prettier-2.2.0" + sources."prettier-2.2.1" (sources."request-light-0.2.5" // { dependencies = [ sources."vscode-nls-4.1.2" @@ -67101,7 +67164,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -67120,7 +67183,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67502,7 +67565,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -68097,7 +68160,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."global-4.3.2" + sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.4" @@ -68272,7 +68335,7 @@ in sources."prepend-http-1.0.4" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" - sources."process-0.5.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" sources."prompt-1.0.0" @@ -68497,7 +68560,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xhr-2.5.0" + sources."xhr-2.6.0" sources."xsalsa20-1.1.0" sources."xtend-4.0.2" sources."yallist-2.1.2" @@ -69097,7 +69160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -69197,7 +69260,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.136" + sources."@microsoft/load-themed-styles-1.10.138" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -70503,7 +70566,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -70750,7 +70813,7 @@ in sources."terser-4.8.0" sources."terser-webpack-plugin-1.4.5" sources."to-regex-range-2.1.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" ]; }) sources."webpack-sources-1.4.3" @@ -71120,10 +71183,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.3.tgz"; - sha512 = "yoPZo7QCrjJY08r0YQtNQ+FzfTI0+PCoDf6Uqk/cLxLfTVc/LwXAn2RNXdjmz6+MnCtowjciYYrcuqaizDPOdg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.6.tgz"; + sha512 = "dpNpZMddzA3WUQQyT7VVUOg9UlQiRSjlFWOqXIqZyDSSc/XPWwC1DNrtOCMYvVwDm4sfIUnmiSA7LSM5MJWnGw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -71260,12 +71323,12 @@ in }) sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - (sources."@expo/config-3.3.16" // { + (sources."@expo/config-3.3.18" // { dependencies = [ sources."semver-7.3.2" ]; }) - (sources."@expo/config-plugins-1.0.3" // { + (sources."@expo/config-plugins-1.0.5" // { dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" @@ -71279,7 +71342,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.41" // { + (sources."@expo/dev-server-0.1.43" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71296,7 +71359,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.62" + sources."@expo/dev-tools-0.13.65" sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.9" // { dependencies = [ @@ -71309,7 +71372,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.41" + sources."@expo/metro-config-0.1.43" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71356,14 +71419,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.46" // { + (sources."@expo/webpack-config-0.12.48" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.2" // { + (sources."@expo/xdl-59.0.5" // { dependencies = [ sources."chownr-1.1.4" (sources."fs-minipass-1.2.7" // { @@ -71788,7 +71851,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -72047,7 +72110,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72124,7 +72187,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.52" // { + (sources."expo-pwa-0.0.54" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72239,7 +72302,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."global-4.3.2" + sources."global-4.4.0" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" @@ -72385,7 +72448,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.3.2" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" @@ -72670,7 +72733,6 @@ in dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" - sources."process-0.11.10" sources."punycode-1.4.1" ]; }) @@ -72724,7 +72786,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -73002,7 +73064,7 @@ in sources."deepmerge-2.2.1" ]; }) - sources."process-0.5.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" @@ -73749,7 +73811,7 @@ in sources."uuid-7.0.3" ]; }) - sources."xhr-2.5.0" + sources."xhr-2.6.0" sources."xml-js-1.6.11" sources."xml-parse-from-string-1.0.1" (sources."xml2js-0.4.23" // { @@ -73761,7 +73823,7 @@ in sources."xmldoc-1.1.2" sources."xmldom-0.1.31" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" @@ -73931,7 +73993,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -74688,7 +74750,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -74721,6 +74783,57 @@ in bypassCache = true; reconstructLock = true; }; + flood = nodeEnv.buildNodePackage { + name = "flood"; + packageName = "flood"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flood/-/flood-4.2.0.tgz"; + sha512 = "xdfiYucaiUEmaScEDZr24vq5qkBe7cC51YeFG9gSFZF0ccGtoVG1RMw55vA06VyMxLUlYVqR9uYxyKVmk/xDBg=="; + }; + dependencies = [ + sources."async-2.6.3" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" + sources."colors-1.4.0" + sources."concat-map-0.0.1" + sources."fd-slicer-1.1.0" + sources."fs.realpath-1.0.0" + sources."geoip-country-4.0.44" + sources."glob-7.1.6" + sources."iconv-lite-0.5.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ip-address-6.4.0" + sources."jsbn-1.1.0" + sources."lazy-1.0.11" + sources."lodash-4.17.20" + sources."lodash.find-4.6.0" + sources."lodash.max-4.0.1" + sources."lodash.merge-4.6.2" + sources."lodash.padstart-4.6.1" + sources."lodash.repeat-4.1.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."rimraf-2.7.1" + sources."safer-buffer-2.1.2" + sources."sprintf-js-1.1.2" + sources."wrappy-1.0.2" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; + homepage = "https://github.com/jesec/flood#readme"; + license = "GPL-3.0-only"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; @@ -74950,7 +75063,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -75267,7 +75380,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.1" - sources."nearley-2.19.8" + sources."nearley-2.19.9" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -75648,7 +75761,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -75717,45 +75830,45 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) - (sources."@graphql-tools/delegate-7.0.5" // { + (sources."@graphql-tools/delegate-7.0.7" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.5" // { + (sources."@graphql-tools/merge-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) - (sources."@graphql-tools/schema-7.1.0" // { + (sources."@graphql-tools/schema-7.1.2" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) (sources."@graphql-tools/url-loader-6.4.0" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/utils-6.2.4" - (sources."@graphql-tools/wrap-7.0.1" // { + (sources."@graphql-tools/wrap-7.0.3" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -75958,7 +76071,7 @@ in }) sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-boolean-object-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" @@ -76071,7 +76184,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.4" sources."oauth-sign-0.9.0" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -76649,7 +76762,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -77047,7 +77160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -77429,7 +77542,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -77526,7 +77639,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -78181,7 +78294,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.0" + sources."jquery.terminal-2.20.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -78817,7 +78930,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."spiro-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -78882,7 +78995,7 @@ in sources."supports-color-7.2.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; @@ -79106,7 +79219,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -79473,7 +79586,7 @@ in sources."commander-2.20.3" sources."debug-4.3.1" sources."html-minifier-4.0.0" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" ]; }) sources."minimatch-3.0.4" @@ -79488,7 +79601,7 @@ in sources."multiparty-4.2.2" sources."mustache-4.0.1" sources."nan-2.14.2" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -80174,7 +80287,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" @@ -80490,7 +80603,7 @@ in sources."wrappy-1.0.2" sources."ws-7.4.0" sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" @@ -80965,13 +81078,14 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.3" - (sources."@octokit/endpoint-6.0.9" // { + sources."@octokit/auth-token-2.4.4" + (sources."@octokit/endpoint-6.0.10" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) + sources."@octokit/openapi-types-1.2.2" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -80984,9 +81098,9 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.10" // { + (sources."@octokit/request-5.4.11" // { dependencies = [ - sources."@octokit/request-error-2.0.3" + sources."@octokit/request-error-2.0.4" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -80997,7 +81111,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.5.0" + sources."@octokit/types-6.0.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -81582,7 +81696,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -81748,7 +81862,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -81818,7 +81932,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -81876,7 +81990,7 @@ in ]; }) sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-14.2.3" // { dependencies = [ @@ -83094,7 +83208,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -83218,7 +83332,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83733,7 +83847,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -83920,7 +84034,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-13.3.2" // { dependencies = [ @@ -84507,7 +84621,7 @@ in sources."@fluentui/react-theme-provider-0.18.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.136" + sources."@microsoft/load-themed-styles-1.10.138" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/classnames-2.2.11" @@ -84872,7 +84986,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -85142,23 +85256,23 @@ in sources."@babel/template-7.12.7" sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" - sources."@bugsnag/browser-7.5.1" - sources."@bugsnag/core-7.3.5" + sources."@bugsnag/browser-7.5.3" + sources."@bugsnag/core-7.5.3" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.5.1" - sources."@bugsnag/node-7.3.5" + sources."@bugsnag/js-7.5.3" + sources."@bugsnag/node-7.5.3" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.3.3" // { + (sources."@netlify/build-5.5.2" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.2" ]; }) sources."@netlify/cache-utils-1.0.6" - (sources."@netlify/config-2.4.0" // { + (sources."@netlify/config-2.4.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -85175,12 +85289,13 @@ in }) sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.10.0" + sources."@netlify/plugins-list-2.0.0" sources."@netlify/run-utils-1.0.5" sources."@netlify/traffic-mesh-agent-0.27.0" sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" - (sources."@netlify/zip-it-and-ship-it-1.4.2" // { + (sources."@netlify/zip-it-and-ship-it-1.5.0" // { dependencies = [ sources."resolve-2.0.0-next.2" ]; @@ -85288,13 +85403,14 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.3" - (sources."@octokit/endpoint-6.0.9" // { + sources."@octokit/auth-token-2.4.4" + (sources."@octokit/endpoint-6.0.10" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) + sources."@octokit/openapi-types-1.2.2" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -85306,9 +85422,9 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.10" // { + (sources."@octokit/request-5.4.11" // { dependencies = [ - sources."@octokit/request-error-2.0.3" + sources."@octokit/request-error-2.0.4" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -85319,8 +85435,8 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.5.0" - sources."@rollup/plugin-babel-5.2.1" + sources."@octokit/types-6.0.1" + sources."@rollup/plugin-babel-5.2.2" (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ sources."estree-walker-2.0.1" @@ -85420,7 +85536,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85499,7 +85615,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -85749,8 +85865,8 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" - sources."elf-tools-1.1.2" + sources."electron-to-chromium-1.3.612" + sources."elf-cam-0.1.1" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -86338,7 +86454,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-treeify-1.1.30" sources."object-visit-1.0.1" @@ -86528,7 +86644,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.33.3" + sources."rollup-2.34.0" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -86624,7 +86740,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -86771,7 +86887,7 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -86853,7 +86969,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yarn-1.22.10" @@ -87250,7 +87366,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -88053,7 +88169,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -89053,7 +89169,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -89188,7 +89304,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89200,7 +89316,7 @@ in sources."error-ex-1.3.2" (sources."es-abstract-1.18.0-next.1" // { dependencies = [ - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" ]; }) sources."es-to-primitive-1.2.1" @@ -89764,7 +89880,7 @@ in (sources."util.promisify-1.0.1" // { dependencies = [ sources."es-abstract-1.17.7" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" ]; }) sources."uuid-3.4.0" @@ -90047,7 +90163,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -90063,7 +90179,7 @@ in sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" (sources."yargs-13.3.2" // { dependencies = [ sources."yargs-parser-13.1.2" @@ -90526,7 +90642,7 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -90611,7 +90727,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -91304,7 +91420,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91339,10 +91455,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.4.tgz"; - sha512 = "Q/1SlzLitcrggjTJN7Ooiu2y5ty+yTaxJYb7xGt6QpNijsIhxkGK58pP8IZYh04C7+8aI9MxNgppOTOyQG7k5g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.5.tgz"; + sha512 = "EJO8eYZyNpOvW+JhjBnLtxD2xcC6YlrzH8jxjETj8bevLATFa9vnGq614ada6o1XOIMq31JWtj1WyPJNogAzLA=="; }; buildInputs = globalBuildInputs; meta = { @@ -91466,7 +91582,6 @@ in sources."lodash.get-4.4.2" sources."lodash.groupby-4.6.0" sources."lodash.sortby-4.7.0" - sources."log-symbols-4.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."normalize-path-3.0.0" @@ -91476,7 +91591,7 @@ in sources."picomatch-2.2.2" sources."pify-2.3.0" sources."postcss-load-config-3.0.0" - sources."postcss-reporter-7.0.1" + sources."postcss-reporter-7.0.2" sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" sources."readdirp-3.5.0" @@ -91895,10 +92010,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.88"; + version = "1.1.90"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.88.tgz"; - sha512 = "1bjnvqNd5xlqTzlwr1W0/WLj+fKItMpQuBr2fvI3OPnWz5iRNcIdj30pR5yCP5ddThSW8xHjQmutf/aked2I8w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.90.tgz"; + sha512 = "CNrTDpxd4vWcGpjxCPLg2fvKYlEhU8ksi7Fkdb+bFNfOb/1ENvZ8QoDYebtLFceoBlgWU9X+MluuFKudwHKKkw=="; }; buildInputs = globalBuildInputs; meta = { @@ -91950,7 +92065,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arguments-1.0.4" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-boolean-object-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" @@ -91975,7 +92090,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -92211,10 +92326,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.1.tgz"; - sha512 = "RZqE1dFdIB3hBvxpBc+CRTjD10xDdPIUk3xA4moHzQMP5Gp2MeGCiRWyt747+4CV42s7oUQbxSMeeY1IMz0vAQ=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.2.tgz"; + sha512 = "AQHx67+fJ+7PZUGf0Vl24XO02isSLHU7fh/OXu6wreFm6B1+xrVhcehV9um2nk63Zq9GFenjnv2GoXEyMSGc7Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -92241,7 +92356,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -92461,7 +92576,7 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.47" + sources."redoc-2.0.0-rc.48" sources."reftools-1.1.7" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" @@ -92500,7 +92615,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -92533,7 +92648,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-parser-18.1.3" ]; }) @@ -92570,10 +92685,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.33.3"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; - sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.34.0.tgz"; + sha512 = "dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -92852,7 +92967,7 @@ in sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.33.3" + sources."rollup-2.34.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-5.0.1" @@ -92926,7 +93041,7 @@ in }) sources."wrappy-1.0.2" sources."write-1.0.3" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yargs-13.3.2" // { dependencies = [ @@ -93249,10 +93364,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.13.0.tgz"; - sha512 = "MOz0JYlPrWGwuyVUIncyaNRSlwOzVUFj5T/ITRjtO5PYXUWr+BB+yhZ97KoOhuL/hVnQ7ZjsmYgOvzo8hHwv9w=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.14.0.tgz"; + sha512 = "c3PRJPQqRmg2NRIcv3c0iD0XZbrJsEczWdSLXwi8AGdcokIbvjTM6fXOsq7i0nhL/BYyaib1O9WazEgmvpDGDw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -93322,7 +93437,7 @@ in sources."@serverless/utils-china-1.0.11" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.6" + sources."@tencent-sdk/capi-1.1.8" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" @@ -93386,7 +93501,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93900,7 +94015,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."long-4.0.0" ]; }) @@ -94744,17 +94859,21 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.431.2"; + version = "1.432.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.431.2.tgz"; - sha512 = "DGm/bxtCSI/ReGK0vMphicQyZtVXiLgLvWkdDbRmsMb4Q7VRylAq9z+5lursLriED7eTjxlkgFMjOdGOuIoxpg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.432.1.tgz"; + sha512 = "fyrxd921tgEkLx8XVUaWXu+0hqImQPQm9+EOWvVXcYUnw19TNUgAQsY02SY3f6AO35E9+JZbra1Okd56CrqYBg=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" - sources."@snyk/cli-interface-2.9.2" - sources."@snyk/cocoapods-lockfile-parser-3.5.2" + sources."@snyk/cli-interface-2.11.0" + (sources."@snyk/cocoapods-lockfile-parser-3.5.2" // { + dependencies = [ + sources."@snyk/dep-graph-1.19.4" + ]; + }) sources."@snyk/composer-lockfile-parser-1.4.1" - sources."@snyk/dep-graph-1.19.4" + sources."@snyk/dep-graph-1.21.0" sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/gemfile-1.2.0" sources."@snyk/java-call-graph-builder-1.16.2" @@ -95139,14 +95258,16 @@ in sources."snyk-go-parser-1.4.1" (sources."snyk-go-plugin-1.16.2" // { dependencies = [ + sources."@snyk/dep-graph-1.19.4" sources."rimraf-3.0.2" sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.10.2" // { + (sources."snyk-gradle-plugin-3.10.3" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ + sources."@snyk/dep-graph-1.19.4" sources."tslib-1.14.1" ]; }) @@ -95165,6 +95286,11 @@ in (sources."snyk-mvn-plugin-2.23.4" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" + (sources."@snyk/dep-graph-1.19.4" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@snyk/java-call-graph-builder-1.16.5" // { dependencies = [ sources."tmp-0.2.1" @@ -95198,11 +95324,6 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.1" // { dependencies = [ - (sources."@snyk/dep-graph-1.21.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."tslib-2.0.3" ]; }) @@ -95538,7 +95659,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -95838,7 +95959,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.0.4" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" @@ -95966,7 +96087,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.8" + sources."nearley-2.19.9" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -95987,7 +96108,7 @@ in }) ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -96480,7 +96601,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -97042,7 +97163,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -97211,7 +97332,7 @@ in sources."xpath-0.0.5" sources."xpath.js-1.1.0" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { dependencies = [ @@ -97311,7 +97432,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97349,7 +97470,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -97531,7 +97652,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { @@ -97555,7 +97676,7 @@ in sources."unified-9.2.0" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" @@ -97637,7 +97758,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."nth-check-1.0.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.1" @@ -98239,7 +98360,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -98406,7 +98527,7 @@ in sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" sources."ws-6.2.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; @@ -98588,7 +98709,7 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -98637,7 +98758,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { @@ -98746,7 +98867,7 @@ in sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."regexp.prototype.flags-1.3.0" @@ -99058,7 +99179,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -99125,7 +99246,7 @@ in sources."unified-message-control-3.0.1" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" @@ -99325,7 +99446,7 @@ in sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.values-1.1.2" @@ -99378,7 +99499,7 @@ in sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.3" @@ -99479,7 +99600,7 @@ in sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.3" @@ -100472,10 +100593,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; - sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; + sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -101156,8 +101277,9 @@ in sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."request-light-0.3.0" - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ + sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" ]; }) @@ -101200,9 +101322,9 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" ]; @@ -101698,7 +101820,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -102025,7 +102147,7 @@ in }) sources."wrappy-1.0.2" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-13.3.2" // { dependencies = [ @@ -102299,7 +102421,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -103030,7 +103152,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -103202,7 +103324,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.5" // { + (sources."vscode-css-languageservice-4.4.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -103947,7 +104069,7 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -103984,7 +104106,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -104361,7 +104483,7 @@ in sources."decamelize-1.2.0" sources."strip-ansi-6.0.0" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-parser-18.1.3" ]; }) @@ -104391,10 +104513,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.8.0.tgz"; - sha512 = "X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.9.0.tgz"; + sha512 = "YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA=="; }; dependencies = [ sources."@types/eslint-7.2.5" @@ -104427,11 +104549,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.7" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."enhanced-resolve-5.3.2" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -104907,7 +105029,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -105156,7 +105278,7 @@ in }) sources."wrappy-1.0.2" sources."ws-6.2.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; @@ -105305,7 +105427,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -105669,8 +105791,9 @@ in sources."ms-2.0.0" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ + sources."jsonc-parser-3.0.0" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" ]; @@ -106403,7 +106526,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index ac900a8dd18..60e774918d5 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-async"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.04.1"; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index d249c451291..eb4de44d7a6 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-lwt-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 0d4ab400dd3..134c161d266 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 75eb2255ee7..749a043e739 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf, ppx_let }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let }: buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; + useDune2 = true; minimumOCamlVersion = "4.04"; @@ -14,6 +15,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ppx_let ]; + buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index b6360160891..f790a87e22c 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,12 +1,25 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -stdenv.mkDerivation rec { - version = "0.8.3"; - name = "ocaml${ocaml.version}-astring-${version}"; +let + # Use astring 0.8.3 for OCaml < 4.05 + param = + if stdenv.lib.versionAtLeast ocaml.version "4.05" + then { + version = "0.8.5"; + sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; + } else { + version = "0.8.3"; + sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + }; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-astring-${param.version}"; + inherit (param) version; src = fetchurl { - url = "https://erratique.ch/software/astring/releases/astring-${version}.tbz"; - sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + url = "https://erratique.ch/software/astring/releases/astring-${param.version}.tbz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 9f6810379ae..852459c2bac 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "bigstringaf"; - version = "0.6.0"; + version = "0.7.0"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,7 +12,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; + sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index e541f0741a6..8a16dcec343 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.16.0"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0qh2gfx5682wkk2nm1ybspzz9c2xvlnnf6iv08a89kbwa1hvdqrg"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index decbb411767..b36874d49da 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -10,6 +10,8 @@ buildDunePackage rec { pname = "earlybird"; version = "0.1.5"; + useDune2 = true; + minimumOCamlVersion = "4.04"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 330ab26e8e6..4f108320399 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, alcotest, cmdliner +{ lib, fetchurl, buildDunePackage, alcotest, cmdliner , rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime }: buildDunePackage rec { pname = "functoria"; - version = "3.1.0"; + version = "3.1.1"; + + useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "15jdqdj1vfi0x9gjydrrnbwzwbzw34w1iir032jrji820xlblky2"; + sha256 = "0bihxbq16zwsi7frk4b8wz8993mvy2ym3n6288jhv0n0gb7c2f7m"; }; propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; @@ -18,7 +20,7 @@ buildDunePackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A DSL to organize functor applications"; homepage = "https://github.com/mirage/functoria"; license = licenses.isc; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix index 806ae82b6ef..2ba13ce8738 100644 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "functoria-runtime"; - inherit (functoria) version src; + inherit (functoria) version useDune2 src; propagatedBuildInputs = [ cmdliner fmt ]; checkInputs = [ alcotest functoria]; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index a949b339c72..ca14c3ca873 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "integers"; - version = "0.3.0"; + version = "0.4.0"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "1yhif5zh4srh63mhimfx3p5ljpb3lixjdd3i9pjnbj2qgpzlqj8p"; + sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index e1b68a1d2da..f14383207ea 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "ke"; version = "0.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz"; sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx"; @@ -14,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bigarray-compat fmt ]; - checkInputs = lib.optionals doCheck [ alcotest bigstringaf ]; + checkInputs = [ alcotest bigstringaf ]; doCheck = true; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/mirage/types-lwt.nix b/pkgs/development/ocaml-modules/mirage/types-lwt.nix new file mode 100644 index 00000000000..ac232b0be6e --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage/types-lwt.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, mirage-types +}: + +buildDunePackage { + pname = "mirage-types-lwt"; + inherit (mirage-types) version src useDune2; + + propagatedBuildInputs = [ mirage-types ]; + + meta = mirage-types.meta // { + description = "Lwt module type definitions for MirageOS applications"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage/types.nix b/pkgs/development/ocaml-modules/mirage/types.nix new file mode 100644 index 00000000000..f30a9e263bb --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage/types.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, mirage +, mirage-block, mirage-channel, mirage-clock, mirage-console, mirage-device +, mirage-flow, mirage-fs, mirage-kv, mirage-net, mirage-protocols, mirage-random +, mirage-stack, mirage-time +}: + +buildDunePackage { + pname = "mirage-types"; + inherit (mirage) src version useDune2; + + propagatedBuildInputs = [ mirage-block mirage-channel mirage-clock + mirage-console mirage-device mirage-flow mirage-fs mirage-kv mirage-net + mirage-protocols mirage-random mirage-stack mirage-time + ]; + + meta = mirage.meta // { + description = "Module type definitions for MirageOS applications"; + }; +} diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index abe4b7efdea..4ec71846919 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -14,9 +14,10 @@ buildPecl { }; configureFlags = [ "--with-couchbase" ]; + broken = lib.versionAtLeast php.version "8.0"; buildInputs = with pkgs; [ libcouchbase zlib ]; - internalDeps = [ php.extensions.json ]; + internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; peclDeps = [ php.extensions.igbinary ]; patches = [ diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 63524fb2d06..504e15ae16d 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs, pcre' }: +{ buildPecl, fetchpatch, lib, pkgs, pcre' }: buildPecl { pname = "imagick"; @@ -6,6 +6,14 @@ buildPecl { version = "3.4.4"; sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; + patches = [ + # Fix compatibility with PHP 8. + (fetchpatch { + url = "https://github.com/Imagick/imagick/pull/336.patch"; + sha256 = "nuRdh02qaMx0s/5OzlfWjyYgZG1zgrYnAjsZ/UVIrUM="; + }) + ]; + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 41ff8f38689..a61ae1194ff 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -7,8 +7,9 @@ buildPecl { sha256 = "1cfsbxf3q3im0cmalgk76jpz581zr92z03c1viy93jxb53k2vsgl"; internalDeps = with php.extensions; [ - json session + ] ++ lib.optionals (lib.versionOlder php.version "8.0") [ + json ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index 0fd28701816..cdae502e7e5 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { description = "Python library for driving the Pimoroni BME680 Breakout"; homepage = "https://github.com/pimoroni/bme680-python"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 0492e271746..8a4933d1954 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.8.2"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499"; + sha256 = "259592a0d6a89cbe63c0c5771f9c0c2522387415af8d715f599583eac659f7d4"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 34e58e0927c..aba5ebf609b 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchpatch , fetchPypi , unittest2 , colander @@ -9,30 +8,21 @@ buildPythonPackage rec { pname = "ColanderAlchemy"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw"; + sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl"; }; - patches = [ - (fetchpatch { - url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch"; - sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx"; - }) - ]; - - buildInputs = [ unittest2 ]; propagatedBuildInputs = [ colander sqlalchemy ]; + # Tests are not included in Pypi + doCheck = false; + meta = with stdenv.lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = "https://github.com/stefanofontanelli/ColanderAlchemy"; license = licenses.mit; - # ColanderAlchemy's tests currently fail with colander >1.6.0 - # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) - broken = versionOlder "1.6.0" colander.version; }; - } diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 74ac3bbfdf3..362f2b11b1c 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.15.194"; + version = "2.16.196"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "976e9b4e18bccbabae04149c33247a795edb1f00110f1b511c5517ac6ac353bb"; + sha256 = "8fd96e3586444e577b356c0ac62511414e76027ff159ebe0d0b3e44b881406d1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index b49f31e4022..34eb0a158d9 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.14.4"; + version = "2.14.5"; disabled = pythonOlder "3.3"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0c3q31lqzrc52gacnqc271k5952qbyl0z4kagsqvl7fiwk84hqlz"; + sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 81b903621b5..46c63ec0008 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,26 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib, fetchPypi, buildPythonPackage, pythonOlder, pythonAtLeast, isPy27 , flake8 -, importlib-metadata , pycodestyle -, pytestrunner -, pytest +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "flake8-debugger"; - version = "3.2.1"; + version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "712d7c1ff69ddf3f0130e94cc88c2519e720760bce45e8c330bfdcb61ab4090d"; + sha256 = "e43dc777f7db1481db473210101ec2df2bd39a45b149d7218a618e954177eda6"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ flake8 pycodestyle six ]; - propagatedBuildInputs = [ flake8 pycodestyle ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; # Tests not included in PyPI tarball # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index e183e79f570..a3d32727515 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "goobook"; - version = "3.5"; + version = "3.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9"; + sha256 = "6e69aeaf69112d116302f0c42ca1904f3b6efd17f15cefc12c866206160293be"; }; nativeBuildInputs = [ docutils installShellFiles ]; @@ -23,6 +23,10 @@ buildPythonPackage rec { installManPage goobook.1 ''; + doCheck = false; + + pythonImportsCheck = [ "goobook" ]; + meta = with stdenv.lib; { description = "Access your Google contacts from the command line"; longDescription = '' diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix index 513b76bafa4..5bc568f879d 100644 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -1,20 +1,22 @@ { lib, buildPythonPackage, fetchPypi -, grpc_google_iam_v1, google_api_core +, grpc_google_iam_v1, google_api_core, libcst, proto-plus , pytest, mock }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cm3xqacxnbpv2706bd2jl86mvcsphpjlvhzngz2k2p48a0jjx8r"; + sha256 = "1w2q602ww8s3n714l2gnaklqzbczshrspxvmvjr6wfwwalxwkc62"; }; propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 + libcst + proto-plus ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 74496e40220..41973e80584 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -13,20 +13,19 @@ buildPythonPackage rec { pname = "ircrobots"; - version = "0.3.5"; + version = "0.3.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "1w04gif227fhzalrds9rscqmckv5h0x2p8600s876i19w41swi32"; + sha256 = "1c8h8b78gmnfipppr9dxp7sl6wd9lx4l3pdwykaib1f49dqwavys"; }; postPatch = '' # too specific pins https://github.com/jesopo/ircrobots/issues/3 - sed -iE 's/==.*//' requirements.txt - sed -iE 's/dataclasses.*/dataclasses; python_version < "3.7"/' requirements.txt + sed -iE 's/anyio.*/anyio/' requirements.txt ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 3cd4fb09f90..3e54451eb36 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ircstates"; - version = "0.11.5"; + version = "0.11.6"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "1b1py1q02wbp4fmkjvchvazklfqibqd6pb28gdq7dg1bwwwd7vda"; + sha256 = "0yhrd1nmf9fjwknbga8wspy3bab40lgp4qqnr7w75x9wq5ivmqhg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix new file mode 100644 index 00000000000..4307d52d891 --- /dev/null +++ b/pkgs/development/python-modules/lexid/default.nix @@ -0,0 +1,22 @@ +{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }: + +buildPythonPackage rec { + pname = "lexid"; + version = "2020.1005"; + disabled = pythonOlder "3.6"; + src = fetchPypi { + inherit pname version; + sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1"; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "micro library to increment lexically ordered numerical ids"; + homepage = "https://pypi.org/project/lexid/"; + license = licenses.mit; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 8dddf105d1c..67896c362f5 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,12 +1,12 @@ { stdenv , fetchFromGitHub }: rec { - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "0mwg6b2y3wfpvgxb9lznwblb3bnrayn858nc4fbbg76zdp5bk5ky"; + sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk"; }; meta = with stdenv.lib; { homepage = "https://openrazer.github.io/"; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 104619711a7..4eded1a6210 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5672c2b6ca0f1fd803f3b45568c2cf7fadf135b4971e7d665232b2075544c0ef"; + sha256 = "084z41f8mh9g7pnmbqd2cn5dq3v05qjcrnj1ifpn2nfny86rklx4"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index 9f97d7df135..0673a3f8dba 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pproxy"; - version = "2.3.2"; + version = "2.3.7"; disabled = isPy27; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qwj"; repo = "python-proxy"; - rev = "818ab9cc10565789fe429a7be50ddefb9c583781"; - sha256 = "0g3cyi5lzakhs5p3fpwywbl8jpapnr8890zw9w45dqg8k0svc1fi"; + rev = "7fccf8dd62204f34b0aa3a70fc568fd6ddff7728"; + sha256 = "1sl2i0kymnbsk49ina81yjnkxjy09541f7pmic8r6rwsv1s87skc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 6b56a42246f..e53472c6ead 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,23 +6,23 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "1hpcwbknfah3mky2m4asw15b9qdvv4k5ni0js764n1jpi83m1zgk"; + sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh"; }; pythonImportsCheck = [ "pylatexenc" ]; - dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; homepage = "https://pylatexenc.readthedocs.io"; downloadPage = "https://www.github.com/phfaist/pylatexenc/releases"; + changelog = "https://pylatexenc.readthedocs.io/en/latest/changes/"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix new file mode 100644 index 00000000000..c25b1b11435 --- /dev/null +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestrunner +, requests +}: + +buildPythonPackage rec { + pname = "pyosf"; + version = "1.0.5"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "psychopy"; + repo = pname; + rev = "v${version}"; + sha256 = "1fkpmylpcbqa9ky111mz4qr1n8pik49gs7pblbb5qx6b54fzl5k2"; + }; + + preBuild = "export HOME=$TMP"; + buildInputs = [ pytestrunner ]; # required via `setup_requires` + propagatedBuildInputs = [ requests ]; + + doCheck = false; # requires network access + pythonImportsCheck = [ "pyosf" ]; + + meta = with lib; { + homepage = "https://github.com/psychopy/pyosf"; + description = "Pure Python library for simple sync with Open Science Framework"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix new file mode 100644 index 00000000000..e1e0578c83b --- /dev/null +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, tqdm +, spacy +}: + +buildPythonPackage rec { + pname = "pysbd"; + version = "0.3.3"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "56ab48a28a8470f0042a4cb7c9da8a6dde8621ecf87a86d75f201cbf1837e77f"; + }; + + checkInputs = [ tqdm spacy ]; + + doCheck = false; # requires pyconll and blingfire + + pythonImportsCheck = [ "pysbd" ]; + + meta = with lib; { + description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages"; + homepage = "https://github.com/nipunsadvilkar/pySBD"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 98ffbe5ad9e..239568f64b7 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyserial"; - version="3.4"; + version="3.5"; src = fetchPypi { inherit pname version; - sha256 = "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf"; + sha256 = "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw"; }; checkPhase = "python -m unittest discover -s test"; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 8e73e942be9..57d89b55711 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -3,34 +3,39 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch + # C Inputs +, blas +, catch2 , cmake -, cvxpy , cython , muparserx , ninja , nlohmann_json +, spdlog + # Python Inputs +, cvxpy , numpy -, openblas , pybind11 , scikit-build -, spdlog # Check Inputs -, qiskit-terra , pytestCheckHook -, python +, ddt +, fixtures +, pytest-timeout +, qiskit-terra }: buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.6.1"; + version = "0.7.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "1fnv11diis0as8zcc57mamz0gbjd6vj7nw3arxzvwa77ja803sr4"; + sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y"; }; nativeBuildInputs = [ @@ -40,10 +45,11 @@ buildPythonPackage rec { ]; buildInputs = [ - openblas - spdlog - nlohmann_json + blas + catch2 muparserx + nlohmann_json + spdlog ]; propagatedBuildInputs = [ @@ -60,11 +66,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - cmakeFlags = [ - "-DBUILD_TESTS=True" - "-DAER_THRUST_BACKEND=OMP" - ]; - # *** Testing *** pythonImportsCheck = [ @@ -72,11 +73,22 @@ buildPythonPackage rec { "qiskit.providers.aer.backends.qasm_simulator" "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output ]; + # Slow tests + disabledTests = [ + "test_paulis_1_and_2_qubits" + "test_3d_oscillator" + ]; checkInputs = [ - qiskit-terra pytestCheckHook + ddt + fixtures + pytest-timeout + qiskit-terra + ]; + pytestFlagsArray = [ + "--timeout=30" + "--durations=10" ]; - dontUseSetuptoolsCheck = true; # Otherwise runs tests twice preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME @@ -87,9 +99,7 @@ buildPythonPackage rec { # Add qiskit-aer compiled files to cython include search pushd $HOME ''; - postCheck = '' - popd - ''; + postCheck = "popd"; meta = with lib; { description = "High performance simulators for Qiskit"; diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index c90f9ddf2e2..11274c525f0 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,8 +2,6 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch -# , cplex , cvxpy , dlx , docplex @@ -18,38 +16,38 @@ , quandl , scikitlearn , yfinance + # Optional inputs +, withTorch ? false +, pytorch +, withPyscf ? false +, pyscf ? null +, withScikitQuant ? false +, scikit-quant ? null +, withCplex ? false +, cplex ? null # Check Inputs , ddt , pytestCheckHook +, pytest-timeout , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.5"; + version = "0.8.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; # Pypi's tarball doesn't contain tests src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "19sdv7lnc4b1c86rd1dv7pjpi8cmrpzbv7nav0fb899ki8ldqdwq"; + sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b"; }; - # TODO: remove in next release - patches = [ - (fetchpatch { - name = "qiskit-aqua-fix-test-issue-1214.patch"; - url = "https://github.com/Qiskit/qiskit-aqua/commit/284a4323192ac85787b22cbe5f344996fae16f7d.patch"; - sha256 = "0zl8hqa2fq9ng793x4dhh0ny67nnbjcd8l1cdsaaab4ca1y0xcfr"; - }) - ]; - # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ - # cplex cvxpy docplex dlx # Python Dancing Links package @@ -63,7 +61,10 @@ buildPythonPackage rec { quandl scikitlearn yfinance - ]; + ] ++ lib.optionals (withTorch) [ pytorch ] + ++ lib.optionals (withPyscf) [ pyscf ] + ++ lib.optionals (withScikitQuant) [ scikit-quant ] + ++ lib.optionals (withCplex) [ cplex ]; # *** NOTE *** # We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc). @@ -97,8 +98,12 @@ buildPythonPackage rec { postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. - checkInputs = [ ddt qiskit-aer pytestCheckHook ]; - dontUseSetuptoolsCheck = true; + checkInputs = [ + pytestCheckHook + ddt + pytest-timeout + qiskit-aer + ]; pythonImportsCheck = [ "qiskit.aqua" "qiskit.aqua.algorithms" @@ -108,10 +113,13 @@ buildPythonPackage rec { "qiskit.optimization" ]; pytestFlagsArray = [ - # Disabled b/c missing pyscf + "--timeout=30" + "--durations=10" + ] ++ lib.optionals (!withPyscf) [ "--ignore=test/chemistry/test_qeom_ee.py" "--ignore=test/chemistry/test_qeom_vqe.py" "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" + "--ignore=test/chemistry/test_bopes_sampler.py" ]; disabledTests = [ # Disabled due to missing pyscf @@ -123,8 +131,10 @@ buildPythonPackage rec { # Disabling slow tests > 10 seconds "TestVQE" + "TestOOVQE" "TestVQC" "TestQSVM" + "TestOptimizerAQGD" "test_graph_partition_vqe" "TestLookupRotation" "_vqe" @@ -151,6 +161,7 @@ buildPythonPackage rec { "test_confidence_intervals_00001" "test_eoh" "test_qasm_5" + "test_uccsd_hf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index eaf10fd6082..7374d7ce017 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -9,24 +9,36 @@ , requests_ntlm , websockets # Visualization inputs -, ipykernel +, withVisualization ? false +, ipython , ipyvuetify , ipywidgets , matplotlib -, nbconvert -, nbformat , plotly , pyperclip , seaborn # check inputs , pytestCheckHook +, nbconvert +, nbformat , pproxy , vcrpy }: +let + visualizationPackages = [ + ipython + ipyvuetify + ipywidgets + matplotlib + plotly + pyperclip + seaborn + ]; +in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.8.0"; + version = "0.11.1"; disabled = pythonOlder "3.6"; @@ -34,7 +46,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0rrpwr4a82j69j5ibl2g0nw8wbpg201cfz6f234k2v6pj500x9nl"; + sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h"; }; propagatedBuildInputs = [ @@ -44,31 +56,16 @@ buildPythonPackage rec { requests requests_ntlm websockets - # Visualization/Jupyter inputs - ipykernel - ipyvuetify - ipywidgets - matplotlib - nbconvert - nbformat - plotly - pyperclip - seaborn - ]; - - # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) - postPatch = '' - substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" - substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" - ''; + ] ++ lib.optionals withVisualization visualizationPackages; # Most tests require credentials to run on IBMQ checkInputs = [ pytestCheckHook + nbconvert + nbformat pproxy vcrpy - ]; - dontUseSetuptoolsCheck = true; + ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; # These disabled tests require internet connection, aren't skipped elsewhere @@ -76,6 +73,10 @@ buildPythonPackage rec { "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" + + # slow tests + "test_websocket_retry_failure" + "test_invalid_url" ]; # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud). diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index d40afe43f9e..b5295dbd041 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -8,6 +8,13 @@ , qiskit-terra , scikitlearn , scipy + # Optional package inputs +, withVisualization ? false +, matplotlib +, withCvx ? false +, cvxpy +, withJit ? false +, numba # Check Inputs , pytestCheckHook , ddt @@ -17,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.4.0"; + version = "0.5.1"; disabled = pythonOlder "3.6"; @@ -26,16 +33,24 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "07mxhaknkp121xm6mgrpcrbj9qw6j924ra3k0s6vr8qgvfcxvh0y"; + sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y"; }; + # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532. + # TODO: remove on qiskit-ignis v0.5.1 + postPatch = '' + substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" + ''; + propagatedBuildInputs = [ numpy qiskit-terra scikitlearn scipy - ]; - postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts + ] ++ lib.optionals (withCvx) [ cvxpy ] + ++ lib.optionals (withVisualization) [ matplotlib ] + ++ lib.optionals (withJit) [ numba ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts # Tests pythonImportsCheck = [ "qiskit.ignis" ]; @@ -49,7 +64,7 @@ buildPythonPackage rec { ]; disabledTests = [ "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds - "test_qv_fitter" # execution hangs, ran for several minutes + "test_qv_fitter" # execution hangs, ran for several minutes ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index aad0370c3d7..89d39b718cd 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -16,7 +16,8 @@ , retworkx , scipy , sympy - # Python visualization requirements, semi-optional +, withVisualization ? false + # Python visualization requirements, optional , ipywidgets , matplotlib , pillow @@ -24,6 +25,12 @@ , pygments , pylatexenc , seaborn + # Crosstalk-adaptive layout pass +, withCrosstalkPass ? false +, z3 + # Classical function -> Quantum Circuit compiler +, withClassicalFunctionCompiler ? false +, tweedledum ? null # test requirements , ddt , hypothesis @@ -33,17 +40,31 @@ , python }: +let + visualizationPackages = [ + ipywidgets + matplotlib + pillow + pydot + pygments + pylatexenc + seaborn + ]; + crosstalkPackages = [ z3 ]; + classicalCompilerPackages = [ tweedledum ]; +in + buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.15.1"; + version = "0.16.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1p7y36gj3675dmp05nwi0m9nc7h0bwyimir3ncf9wbkx3crrh99c"; + sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq"; }; nativeBuildInputs = [ cython ]; @@ -53,7 +74,6 @@ buildPythonPackage rec { fastjsonschema jsonschema numpy - matplotlib networkx ply psutil @@ -62,26 +82,18 @@ buildPythonPackage rec { retworkx scipy sympy - # Optional/visualization inputs - ipywidgets - matplotlib - pillow - pydot - pygments - pylatexenc - seaborn - ]; - + ] ++ lib.optionals withVisualization visualizationPackages + ++ lib.optionals withCrosstalkPass crosstalkPackages + ++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages; # *** Tests *** checkInputs = [ + pytestCheckHook ddt hypothesis nbformat nbconvert - pytestCheckHook - ]; - dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest + ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit" @@ -90,6 +102,34 @@ buildPythonPackage rec { pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency + ] ++ lib.optionals (!withClassicalFunctionCompiler ) [ + "--ignore=test/python/classical_function_compiler/" + ]; + disabledTests = [ + # Flaky tests + "test_cx_equivalence" + "test_pulse_limits" + ] + # Disabling slow tests for build constraints + ++ [ + "test_all_examples" + "test_controlled_random_unitary" + "test_controlled_standard_gates_1" + "test_jupyter_jobs_pbars" + "test_lookahead_swap_higher_depth_width_is_better" + "test_move_measurements" + "test_job_monitor" + "test_wait_for_final_state" + "test_multi_controlled_y_rotation_matrix_basic_mode" + "test_two_qubit_weyl_decomposition_abc" + "test_isometry" + "test_parallel" + "test_random_state" + "test_random_clifford_valid" + "test_to_matrix" + "test_block_collection_reduces_1q_gate" + "test_multi_controlled_rotation_gate_matrices" + "test_block_collection_runs_for_non_cx_bases" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 46fcf498597..7c79d517ce5 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.20.0"; + version = "0.23.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "Qiskit"; + owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "1r23pjnql49gczf4k4m6ir5rr95gqdxjrks60p8a93d243mxx3c9"; + sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1"; }; propagatedBuildInputs = [ @@ -35,7 +35,6 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "qiskit" @@ -43,6 +42,7 @@ buildPythonPackage rec { "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" + "qiskit.providers.ibmq" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 49e4b1c2fc3..02a3ef64c57 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , python -, fetchpatch , fetchFromGitHub , pipInstallHook , maturin @@ -13,35 +12,30 @@ rustPlatform.buildRustPackage rec { pname = "retworkx"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = version; - sha256 = "1xqp6d39apkjvd0ad9vw81cp2iqzhpagfa4p171xqm3bwfn2imdc"; + sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; }; - cargoSha256 = "0bma0l14jv5qhcsxck7vw3ak1w3c8v84cq4hii86i4iqk523zns5"; - cargoPatches = [ - ( fetchpatch { - name = "retworkx-cargo-lock.patch"; - url = "https://github.com/Qiskit/retworkx/commit/a02fd33d357a92dbe9530696a6d85aa59fe8a5b9.patch"; - sha256 = "0gvxr1nqp9ll4skfks4p4d964pshal25kb1nbfzhpyipnzddizr5"; - } ) - ]; + cargoSha256 = "1vg4yf0k6yypqf9z46zz818mz7fdrgxj7zl6zjf7pnm2r8mq3qw5"; propagatedBuildInputs = [ python ]; nativeBuildInputs = [ pipInstallHook maturin pip ]; - # Need to check AFTER python wheel is installed (b/c using Rust Build, not buildPythonPackage) + # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; doInstallCheck = true; + installCheckInputs = [ pytestCheckHook numpy ]; + buildPhase = '' runHook preBuild - maturin build --release --manylinux off --strip --interpreter ${python.interpreter} + maturin build --release --manylinux off --strip runHook postBuild ''; @@ -50,10 +44,9 @@ rustPlatform.buildRustPackage rec { pipInstallPhase ''; - installCheckInputs = [ pytestCheckHook numpy ]; preCheck = '' export TESTDIR=$(mktemp -d) - cp -r $TMP/$sourceRoot/tests $TESTDIR + cp -r tests/ $TESTDIR pushd $TESTDIR ''; postCheck = "popd"; diff --git a/pkgs/development/python-modules/tinyobjloader-py/default.nix b/pkgs/development/python-modules/tinyobjloader-py/default.nix new file mode 100644 index 00000000000..3c36dded5ee --- /dev/null +++ b/pkgs/development/python-modules/tinyobjloader-py/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, pybind11, tinyobjloader }: + +buildPythonPackage rec { + pname = "tinyobjloader-py"; + inherit (tinyobjloader) version src; + + # Build needs headers from ${src}, setting sourceRoot or fetching from pypi won't work. + preConfigure = '' + cd python + ''; + + buildInputs = [ pybind11 ]; + + # No tests are included upstream + doCheck = false; + pythonImportsCheck = [ "tinyobjloader" ]; + + meta = with lib; tinyobjloader.meta // { + description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader"; + }; +} diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index d3559d31908..39fd7a11d0d 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , boto3 +, cookiecutter , filelock , regex , requests @@ -9,7 +10,6 @@ , parameterized , protobuf , sacremoses -, sentencepiece , timeout-decorator , tokenizers , tqdm @@ -18,23 +18,23 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.5.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "02z5zz0rq7mbgdmsm2ccfdbca57qy7iqp0vc7jspsmdfif4acwia"; + sha256 = "17djq32pq8d6vqip7i9pda0ldigmzckbbcd278llmpxdriqd4llg"; }; propagatedBuildInputs = [ + cookiecutter filelock numpy protobuf regex requests sacremoses - sentencepiece tokenizers tqdm ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.9.3" "tokenizers" \ - --replace "sentencepiece == 0.1.91" "sentencepiece" + --replace "tokenizers == 0.9.4" "tokenizers" ''; preCheck = '' diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix new file mode 100644 index 00000000000..dd6b1d95b4b --- /dev/null +++ b/pkgs/development/ruby-modules/rbenv/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, bash, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "rbenv"; + version = "1.1.2"; + + nativeBuildInputs = [ installShellFiles ]; + + src = fetchFromGitHub { + owner = "rbenv"; + repo = "rbenv"; + rev = "v${version}"; + sha256 = "12i050vs35iiblxga43zrj7xwbaisv3mq55y9ikagkr8pj1vmq53"; + }; + + postPatch = '' + patchShebangs src/configure + pushd src + ''; + + installPhase = '' + popd + mkdir -p $out/bin + mv libexec $out + ln -s $out/libexec/rbenv $out/bin/rbenv + + installShellCompletion completions/rbenv.{bash,zsh} + ''; + + meta = with stdenv.lib; { + description = "Groom your app’s Ruby environment"; + longDescription = '' + Use rbenv to pick a Ruby version for your application and guarantee that your development environment matches production. + Put rbenv to work with Bundler for painless Ruby upgrades and bulletproof deployments. + ''; + homepage = "https://github.com/rbenv/rbenv"; + license = licenses.mit; + maintainers = with maintainers; [ fzakaria ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 5e1e93951c3..fc37324bc92 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.3.3"; + version = "2.4.0"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "17a574g92jfff2059mhaw2x31npglp9rfcwwk73adbajpiyf4g8q"; + sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 77a424ae168..8f01b9aca31 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm"; + hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 405ac1e26b0..f993faf544d 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.7.0"; + version = "6.7.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0jc0hr0h1xya7avzxdwmvhnsm5cr3g21pig52draz5vjaya7bg55"; + sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index f6c7bef1dc8..1913e3d66f6 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.2.1"; + version = "7.3.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0b9pyy5avgr2wh3amnpwfc21i69mbw9a0xdxwg5wlrw83f5rx17w"; + sha256 = "0d5v0g28myqiac0a5qy0sbpf0mjzzi3agyks9cdzsgg3ka1i18q9"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 7cb95b326d6..3a424014ec3 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.13.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "0rzx974cxsipbnggl3n4q6zsvm313svrg718gscydygk41m9nql9"; + sha256 = "1mgs3bngghmirmn0pw351m54darv8d5iymlxcjqw3vr0cyn5aqj0"; }; - vendorSha256 = "1107syipynlfibzljyfgz81v1avi8axvsjpmrpj990pm83r9svc6"; + vendorSha256 = "071gfyx6iqla8ir7ianw1z62rdsds9shakzqs9wn34ll1kdbd4rv"; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 1895cd0786d..316be0b2fc0 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.9.1"; + version = "0.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0q1dxry10iaf7zx6vyr0da4ihqx7l8dlyhlqm8qqfz913h2wam8c"; + sha256 = "0862f582i08h80pm6igmi00qsacl5b9jaahh50l2i3905k7rxf5s"; }; - cargoSha256 = "13zs2xz3s4732zxsimg7b22d9707ln4gpscznxi13cjkf5as9gbz"; + cargoSha256 = "1b0nl4nwjza52madrfsmwivxxvz18b53kynv2fbsbh3zzbrm5fj1"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 8a02f615730..97b5f9ed82c 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,14 +14,15 @@ let soFile = { "7.3" = "blackfire-20180731"; "7.4" = "blackfire-20190902"; + "8.0" = "blackfire-20200930"; }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.44.0"; + version = "1.46.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "15y1244bbs07i7rg6cy8kynp1may4mbkmmwbxgq8q5zma3ldc8ci"; + sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index 103c534dfa3..5008175363c 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -11,8 +11,15 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; + buildInputs = [ makeWrapper ]; + makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/dylibbundler \ + --prefix PATH ":" "${cctools}/bin" + ''; + meta = with stdenv.lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index e7528d4f772..483e9c45df0 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchurl, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "lelio-brun"; - repo = "obelisk"; - rev = "v${version}"; - sha256 = "0rw85knbwqj2rys1hh5qy8sfdqb4mb1wsriy38n7zcpbwim47vb8"; + version = "0.5.2"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; + sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; - - installFlags = [ "BINDIR=$(out)/bin" ]; + buildInputs = with ocamlPackages; [ menhir re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocamlPackages.ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Lelio-Brun/Obelisk"; }; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 355cebfd50c..559025f3ec4 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -7,60 +7,127 @@ import toml import json import sys - -argparser = argparse.ArgumentParser(description="Poetry2nix CLI") - -subparsers = argparser.add_subparsers(dest="subcommand") -subparsers.required = True - -parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) -parser_lock.add_argument( - "--lock", default="poetry.lock", help="Path to input poetry.lock", -) -parser_lock.add_argument( - "--out", default="poetry-git-overlay.nix", help="Output file", -) - - -def fetch_git(pkg): - return ( - pkg["name"], - subprocess.run( - [ - "nix-prefetch-git", - "--fetch-submodules", - "--url", - pkg["source"]["url"], - "--rev", - pkg["source"]["reference"], - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ), +from typing import Dict, Any, Tuple, List + + +class Package: + def __init__(self, attrs: Dict[str, Any]) -> None: + self.attrs = attrs + self.name = attrs["name"] + self.source = self.attrs["source"] + + def fetch(self) -> Tuple["Package", subprocess.CompletedProcess]: + raise NotImplementedError() + + def expression(self, output: str) -> str: + raise NotImplementedError() + + +class UrlPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + return ( + self, + subprocess.run( + [ + "nix-prefetch-url", + "--unpack", + self.source["url"], + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + sha256 = output.rstrip() + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchzip { + url = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, self.source["url"], sha256)) + + +class GitPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + reference = self.source.get("resolved_reference", self.source["reference"]) + + return ( + self, + subprocess.run( + [ + "nix-prefetch-git", + "--fetch-submodules", + "--url", + self.source["url"], + "--rev", + reference, + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + meta = json.loads(output) + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "%s"; + rev = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, meta["url"], meta["rev"], meta["sha256"])) + + +def parse_args() -> argparse.Namespace: + argparser = argparse.ArgumentParser(description="Poetry2nix CLI") + + subparsers = argparser.add_subparsers(dest="subcommand") + subparsers.required = True + + parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) + parser_lock.add_argument( + "--lock", default="poetry.lock", help="Path to input poetry.lock", + ) + parser_lock.add_argument( + "--out", default="poetry-git-overlay.nix", help="Output file", ) + return argparser.parse_args() -def indent(expr, spaces=2): +def indent(expr: str, spaces: int = 2) -> str: i = " " * spaces return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) -if __name__ == "__main__": - args = argparser.parse_args() +def main() -> None: + args = parse_args() with open(args.lock) as lockf: lock = toml.load(lockf) - pkgs = [] + pkgs: List[Package] = [] for pkg in lock["package"]: if "source" in pkg: - pkgs.append(pkg) + source_type = pkg["source"]["type"] + if source_type == "git": + pkgs.append(GitPackage(pkg)) + elif source_type == "url": + pkgs.append(UrlPackage(pkg)) with ThreadPoolExecutor() as e: futures = [] for pkg in pkgs: - futures.append(e.submit(fetch_git, pkg)) + futures.append(e.submit(pkg.fetch)) lines = [ "{ pkgs }:", @@ -68,30 +135,13 @@ if __name__ == "__main__": ] for f in futures: - drv_name, p = f.result() + package, p = f.result() if p.returncode != 0: - sys.stderr.buffer.write(p.stderr) - sys.stderr.buffer.flush() + sys.stderr.write(p.stderr) + sys.stderr.flush() exit(p.returncode) - - meta = json.loads(p.stdout.decode()) - lines.append( - indent( - textwrap.dedent( - """ - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "%s"; - rev = "%s"; - sha256 = "%s"; - }; - } - );""" - % (drv_name, drv_name, meta["url"], meta["rev"], meta["sha256"]) - ) - ) - ) + expr = package.expression(p.stdout) + lines.append(indent(expr)) lines.extend(["", "}", ""]) @@ -101,3 +151,7 @@ if __name__ == "__main__": fout.write(expr) print(f"Wrote {args.out}") + + +if __name__ == "__main__": + main() diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e47dbc99f2a..b0e65ed85a0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.13.0"; + version = "1.14.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 6d60df28473..a66989f70e5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -1,11 +1,11 @@ { python -, callPackage +, buildPackages , makeSetupHook -, yj , wheel , pip }: let + callPackage = python.pythonForBuild.pkgs.callPackage; pythonInterpreter = python.pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; in @@ -20,7 +20,7 @@ in deps = [ ]; substitutions = { inherit pythonInterpreter; - yj = "${yj}/bin/yj"; + yj = "${buildPackages.yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 9619e364937..c01f99c01d4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -27,6 +27,7 @@ pythonPackages.callPackage , ... }@args: let + inherit (pkgs) stdenv; inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { @@ -45,6 +46,7 @@ pythonPackages.callPackage toPath = s: pwd + "/${s}"; isSource = source != null; isGit = isSource && source.type == "git"; + isUrl = isSource && source.type == "url"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; @@ -91,7 +93,7 @@ pythonPackages.callPackage "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; + format = if isLocal || isGit || isUrl then "pyproject" else fileInfo.format; in buildPythonPackage { pname = moduleName name; @@ -113,9 +115,10 @@ pythonPackages.callPackage buildInputs = ( baseBuildInputs + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional isLocal buildSystemPkgs - ++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] + ++ lib.optional (!__isBootstrap) pythonPackages.poetry ); propagatedBuildInputs = @@ -157,14 +160,22 @@ pythonPackages.callPackage ( builtins.fetchGit { inherit (source) url; - rev = source.reference; + rev = source.resolved_reference or source.reference; ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; } - ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else - fetchFromPypi { - pname = name; - inherit (fileInfo) file hash kind; - }; + ) + else if isUrl then + builtins.fetchTarball + { + inherit (source) url; + } + else if isLocal then + (poetryLib.cleanPythonSources { src = localDepPath; }) + else + fetchFromPypi { + pname = name; + inherit (fileInfo) file hash kind; + }; } ) { } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ca6c0c7cc49..16d66c48af8 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -93,7 +93,7 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; } ) ); @@ -106,6 +106,12 @@ self: super: } ); + colour = super.colour.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.d2to1 ]; + } + ); + configparser = super.configparser.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -120,6 +126,8 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { + nativeBuildInputs = old.nativeBuildInputs or [ ] + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); @@ -324,6 +332,17 @@ self: super: } ); + jira = super.jira.overridePythonAttrs ( + old: { + inherit (pkgs.python3Packages.jira) patches; + buildInputs = old.buildInputs ++ [ + self.pytestrunner + self.cryptography + self.pyjwt + ]; + } + ); + jsonpickle = super.jsonpickle.overridePythonAttrs ( old: { dontPreferSetupPy = true; @@ -499,6 +518,31 @@ self: super: buildInputs = oa.buildInputs ++ [ self.pbr ]; }); + mpi4py = super.mpi4py.overridePythonAttrs ( + old: + let + cfg = pkgs.writeTextFile { + name = "mpi.cfg"; + text = ( + lib.generators.toINI + { } + { + mpi = { + mpicc = "${pkgs.openmpi.outPath}/bin/mpicc"; + }; + } + ); + }; + in + { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + enableParallelBuilding = true; + preBuild = '' + ln -sf ${cfg} mpi.cfg + ''; + } + ); + multiaddr = super.multiaddr.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -584,8 +628,8 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; } @@ -602,8 +646,8 @@ self: super: # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; @@ -796,6 +840,14 @@ self: super: } ); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.docutils + ]; + } + ); + python-ldap = super.python-ldap.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; @@ -924,6 +976,15 @@ self: super: } ); + pytest-django = super.pytest-django.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "'pytest>=3.6'," "" + substituteInPlace setup.py --replace "'pytest>=3.6'" "" + ''; + } + ); + pytest-runner = super.pytest-runner or super.pytestrunner; python-jose = super.python-jose.overridePythonAttrs ( @@ -1090,6 +1151,43 @@ self: super: } ); + torch = lib.makeOverridable + ({ enableCuda ? false + , cudatoolkit ? pkgs.cudatoolkit_10_1 + , pkg ? super.torch + }: pkg.overrideAttrs (old: + { + preConfigure = + if (!enableCuda) then '' + export USE_CUDA=0 + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cudatoolkit}/targets/x86_64-linux/lib" + ''; + preFixup = lib.optionalString (!enableCuda) '' + # For some reason pytorch retains a reference to libcuda even if it + # is explicitly disabled with USE_CUDA=0. + find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; + ''; + buildInputs = old.buildInputs ++ lib.optionals enableCuda [ + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; + propagatedBuildInputs = [ + super.numpy + super.future + ]; + }) + ) + { }; + + typeguard = super.typeguard.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + # nix uses a dash, poetry uses an underscore typing_extensions = super.typing_extensions or self.typing-extensions; @@ -1193,4 +1291,30 @@ self: super: } ); + credis = super.credis.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.cython ]; + } + ); + + hashids = super.hashids.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.flit-core ]; + } + ); + + supervisor = super.supervisor.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.meld3 + self.setuptools + ]; + } + ); + + cytoolz = super.cytoolz.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index d32e3aacce6..e333bd49718 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -87,7 +87,7 @@ let filtered = builtins.filter filterWheel filesWithoutSources; choose = files: let - osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; + osxMatches = [ "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index f93eb119b20..70470ba1722 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -15,8 +15,8 @@ poetry2nix.mkPoetryApplication { # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index f099a4cac80..0868175ea45 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.0" +version = "1.1.4" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace <sebastien@eustace.io>" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 51894768c1d..4a1e8890c28 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "539d7f732c34c821258a9853cd3078cbda34a717", - "sha256": "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c", + "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3", + "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs", "fetchSubmodules": true } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix index e7125c2ff57..b5e807c6e2d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix @@ -23,6 +23,7 @@ let dontConfigure = true; dontBuild = true; + dontUsePythonRecompileBytecode = true; passthru = { inherit (drv.passthru) withPlugins; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 6042f5f891a..5506201b742 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.7.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; + sha256 = "0lvkrfszmn594n9qkf518c38c0fwzm32y997wlf28l3hpj6yqddq"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; + cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 89287b2ac4f..c9884a8eacd 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -3,23 +3,20 @@ , cmake }: -let - boostWithPython3 = boost.override { python = python3; enablePython = true; }; -in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.11.07"; + version = "2020.11.25"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-476-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "b013a135a9b95c18ece559e19aa73ad6c84446c9"; - sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf"; + rev = "a441cd9d0390648e96bf27096626eb2c904096de"; + sha256 = "1rsck44n4mf9v3vfac51ksrhcs84s7q297nq1kjkzzvmsx09gd9k"; name = "trellis"; }) @@ -33,7 +30,7 @@ stdenv.mkDerivation rec { ]; sourceRoot = "trellis"; - buildInputs = [ boostWithPython3 ]; + buildInputs = [ boost ]; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 9ac8a2cc2a3..0aa8c65e3cd 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.150"; + version = "0.0.151"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1wj3l32f9xpmqq91nzlxy8zgh1zkx4ckhc9r487agmv80bfjnzj2"; + sha256 = "0gd0cgzhikwa11mfpmvk0dp198vhlh09kjgk67xjj4gg9g61nkg9"; }; preBuild = '' diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 0640e099341..ce6f469c444 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.1.1"; + version = "2020.4.2"; src = fetchurl { url = - "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0lg3j5pr2bkjq5rq035fwh4mgpqsja3ndp11zpcz85ni3nvhn657"; + "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; + sha256 = "0pxf6nphb6k2szgapqkhjavdzq1blg34v1zj47l76r0iqxrpm3va"; }; nativeBuildInputs = diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 82ab40ec3cb..a76f5abc147 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.2.tar.xz", + "name": "factorio_alpha_x64-1.1.3.tar.xz", "needsAuth": true, - "sha256": "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j", + "sha256": "0lsgj7361bf9zhidp4hpdhb9jj7wgcw7s0q5bpqbigbnz848m3lm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.2/alpha/linux64", - "version": "1.1.2" + "url": "https://factorio.com/get-download/1.1.3/alpha/linux64", + "version": "1.1.3" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.2.tar.xz", + "name": "factorio_headless_x64-1.1.3.tar.xz", "needsAuth": false, - "sha256": "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd", + "sha256": "1164hbbd1b33hjnvjm079czjypj837gpjp2i4f23rkd4qmjpl0dj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.2/headless/linux64", - "version": "1.1.2" + "url": "https://factorio.com/get-download/1.1.3/headless/linux64", + "version": "1.1.3" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 3f64d92f07f..c8f9c790842 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.2"; + version = "2.6.2.1"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "023slffi06j52amrnmd8n12rmf778cngxx6xg4hbsgckj2nyfmg9"; + sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5"; }; postPatch = '' diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index c0c8663868d..89ff37458af 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -2,10 +2,11 @@ , makeWrapper , makeDesktopItem , fetchFromGitHub -, gradle_5 +, gradleGen +, jdk14 , perl , jre -, libpulseaudio +, alsaLib # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means @@ -21,14 +22,14 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "104.6"; + version = "120.2"; buildVersion = makeBuildVersion version; src = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i"; + sha256 = "01a7qpwfr1n540fk0k65kl03biix0gmg66z7qn22mb2703laq1xc"; }; desktopItem = makeDesktopItem { @@ -49,11 +50,14 @@ let sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle ''; + # The default one still uses jdk8 (#89731) + gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7; + # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle_5 perl ]; + nativeBuildInputs = [ gradle_6 perl ]; # Here we build both the server and the client so we only have to specify # one hash for 'deps'. Deps can be garbage collected after the build, # so this is not really an issue. @@ -70,7 +74,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw"; + outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7"; }; # Separate commands for building and installing the server and the client @@ -84,7 +88,7 @@ let install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/mindustry \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \ --add-flags "-jar $out/share/mindustry.jar" install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop @@ -102,7 +106,7 @@ assert stdenv.lib.assertMsg (enableClient || enableServer) stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle_5 makeWrapper ]; + nativeBuildInputs = [ gradle_6 makeWrapper ]; buildPhase = with stdenv.lib; '' export GRADLE_USER_HOME=$(mktemp -d) @@ -124,6 +128,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # Hash mismatch on darwin: + # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 + broken = stdenv.isDarwin; }; } - diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 88f0c6abfc5..f41d684d83f 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.1121.0"; + version = "2020.1128.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "54AP3NZv5Nov3CAJoxn5E5tO9HhtlEY36x8OHAV8YVE="; + sha256 = "0qf1lvzd668zd405ll3bdbk91xdyr2l9qg42ph93vjcnmrs2jqic"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 42e5969dfc4..4272a816a58 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -335,6 +335,11 @@ sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.1"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }) + (fetchNuGet { name = "Microsoft.Build.Framework"; version = "15.3.409"; sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; @@ -356,18 +361,18 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; - version = "3.7.0"; - sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; + version = "3.8.0"; + sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.7.0"; - sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; + version = "3.8.0"; + sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; - version = "3.7.0"; - sha256 = "15rlz65wbky0yq7b9s8xwk68dgrhgsk4rj88q9pyjxbm5938vrav"; + version = "3.8.0"; + sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; @@ -381,13 +386,13 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; - version = "3.7.0"; - sha256 = "00nm453w4n6kjsicmz5izvkf1ki9rp3xnc9n3y7a9b1g5sxg36fs"; + version = "3.8.0"; + sha256 = "0qbirv7wxllzw5120pfa42wailfgzvl10373yhacankmfmbz2gnw"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; - version = "3.7.0"; - sha256 = "1sh8s7b16j06p3gmzsgwd8690vagah4908bpa3gyz2fxgfnj46ax"; + version = "3.8.0"; + sha256 = "1ag78ls51s88znv4v004sbklrx3qnbphpdngjq196188a3vljww7"; }) (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; @@ -416,8 +421,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.151903"; - sha256 = "1y7hsgzjs6b3323fcq5km515knykfgvdx4x8l1g03sy5h3lwwhak"; + version = "2.0.156101"; + sha256 = "1k9f6x95mscq484f4sywpb84016v9yb9bz6ha77wsjbsarl96my0"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -546,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "3.1.9"; - sha256 = "1gq1i7rb50dzj9hp07q0w9siyqy3hl0zqpk8na37s4jq6ikb5q82"; + version = "5.0.0"; + sha256 = "0m0r7avz4ygxa1pyj5sai25y0n42y7kz9iznl7m3146csxi1paf0"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -676,8 +681,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.1120.0"; - sha256 = "13vm6qly09f9b9bnf8r4wkypbxz673x852fjllj33sz55qh6957m"; + version = "2020.1127.0"; + sha256 = "05vxdkw5z7bylj8dyw52lxf3g12mmvdifwvwlgz00v6ybkxr455j"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -955,6 +960,11 @@ sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { + name = "System.Collections.Immutable"; + version = "5.0.0"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; @@ -1301,13 +1311,13 @@ }) (fetchNuGet { name = "System.Reflection.Metadata"; - version = "1.6.0"; - sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + version = "1.8.1"; + sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; }) (fetchNuGet { name = "System.Reflection.Metadata"; - version = "1.8.1"; - sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; + version = "5.0.0"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { name = "System.Reflection.Primitives"; @@ -1366,11 +1376,6 @@ }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.7.0"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) @@ -1596,11 +1601,6 @@ }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; - version = "4.5.3"; - sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index db1a6664c54..03397bd244c 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, SDL, cmake }: stdenv.mkDerivation rec { - name = "hatari-2.2.1"; + pname = "hatari"; + version = "2.3.0"; src = fetchurl { - url = "https://download.tuxfamily.org/hatari/2.2.1/${name}.tar.bz2"; - sha256 = "0q3g23vnx58w666723v76ilh9j353md3sn48cmlq9gkll8qfzbqi"; + url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2"; + sha256 = "19dqadi32hgi78hyxxcm8v2vh28vyn9w5nd1xiq683wk0ccicj5z"; }; # For pthread_cancel diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/misc/emulators/lambda-delta/default.nix new file mode 100644 index 00000000000..0668d2db908 --- /dev/null +++ b/pkgs/misc/emulators/lambda-delta/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: + +stdenv.mkDerivation rec { + pname = "lambda-delta"; + version = "0.98.3"; + + src = fetchFromGitHub { + owner = "dseagrav"; + repo = "ld"; + rev = version; + sha256 = "02m43fj9dzc1i1jl01qwnhjiq1rh03jw1xq59sx2h3bhn7dk941x"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ SDL2 ]; + + configureFlags = [ "--without-SDL1" ]; + + meta = with stdenv.lib; { + description = "LMI (Lambda Lisp Machine) emulator"; + homepage = "https://github.com/dseagrav/ld"; + license = licenses.gpl2; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix new file mode 100644 index 00000000000..f3518a647fa --- /dev/null +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -0,0 +1,49 @@ +{ alsaLib +, fetchFromGitHub +, openssl +, pkg-config +, python3 +, rustPlatform +, stdenv +, wayland +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "ruffle"; + version = "nightly-2020-11-30"; + + src = fetchFromGitHub { + owner = "ruffle-rs"; + repo = pname; + rev = version; + sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0"; + }; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + alsaLib + openssl + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libxcb + xorg.libXrender + ]; + + cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; + + meta = with stdenv.lib; { + description = "An Adobe Flash Player emulator written in the Rust programming language."; + homepage = "https://ruffle.rs/"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ govanify ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index de3c78cc52c..28ac5e6f91f 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -127,6 +127,24 @@ in rec { }; }; + dracula = mkDerivation rec { + pluginName = "dracula"; + version = "unstable-2020-12-2"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "tmux"; + rev = "cc310e585acbeaf3304eda662476f7f657010b01"; + sha256 = "003nbv2rz2ihyqf3ryvdwn43ly0gi5z2r0pnqr9s9vw8dmwx0r3x"; + }; + meta = with stdenv.lib; { + homepage = "https://draculatheme.com/tmux"; + description = "A feature packed Dracula theme for tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ethancedwards8 ]; + }; + }; + fingers = mkDerivation rec { pluginName = "fingers"; rtpFilePath = "tmux-fingers.tmux"; @@ -427,6 +445,41 @@ in rec { }; }; + tmux-fzf = mkDerivation { + pluginName = "tmux-fzf"; + version = "unstable-2020-11-23"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "tmux-fzf"; + rev = "312685b2a7747b61f1f4a96bd807819f1450479d"; + sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; + }; + postInstall = '' + find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' + find $target -type f -print0 | xargs -0 sed -i -e 's|sed |${pkgs.gnused}/bin/sed |g' + find $target -type f -print0 | xargs -0 sed -i -e 's|tput |${pkgs.ncurses}/bin/tput |g' + ''; + meta = { + homepage = "https://github.com/sainnhe/tmux-fzf"; + description = "Use fzf to manage your tmux work environment! "; + longDescription = + '' + Features: + * Manage sessions (attach, detach*, rename, kill*). + * Manage windows (switch, link, move, swap, rename, kill*). + * Manage panes (switch, break, join*, swap, layout, kill*, resize). + * Multiple selection (support for actions marked by *). + * Search commands and append to command prompt. + * Search key bindings and execute. + * User menu. + * Popup window support. + ''; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ kyleondy ]; + }; + }; + urlview = mkDerivation { pluginName = "urlview"; version = "unstable-2016-01-06"; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 7533707ccf9..610a8e06385 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "12zj8jfm8jrwbqm3cnay8gx28ladmpyv5d29lp8qlfjqgflvhkwh"; + sha256 = "0sm73a762c7qd6x3f052m00d7daprifimsfa17dfdf4jvy9fqy56"; }; patches = lib.singleton ( diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index bc00f82f19b..b80fcb25a85 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: +{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -25,6 +25,21 @@ let }; }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pylance"; + publisher = "MS-python"; + version = "2020.11.2"; + sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50"; + }; + + buildInputs = [ nodePackages.pyright ]; + + meta = { + license = stdenv.lib.licenses.unfree; + }; + }; + bbenoist.Nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 9faeb831b4b..21f98889ca5 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.33"; + version = "0.35"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0li788l57m2ic1i33fag4nnblqghbwqjyqkgppi8s2sifcvswfbw"; + sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; }; patches = [ diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index a9fc44e48cc..684d638ce29 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -3,24 +3,22 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sof-firmware"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; - rev = "ae61d2778b0a0f47461a52da0d1f191f651e0763"; - sha256 = "0j6bpwz49skvdvian46valjw4anwlrnkq703n0snkbngmq78prba"; + rev = "cbdec6963b2c2d58b0080955d3c11b96ff4c92f0"; + sha256 = "0la2pw1zpv50cywiqcfb00cxqvjc73drxwjchyzi54l508817nxh"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -p $out/lib/firmware/intel + mkdir -p $out/lib/firmware - sed -i 's/ROOT=.*$/ROOT=$out/g' go.sh - sed -i 's/VERSION=.*$/VERSION=v${version}/g' go.sh - - ./go.sh + patchShebangs go.sh + ROOT=$out SOF_VERSION=v${version} ./go.sh ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index adf37a1b71b..8ae600e310a 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.9"; + version = "1.10"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "193wa13i2prfz1zr7nvwbgrxgacms57zj1n7x28yy5hmm3nnwbrd"; + sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5a19e8d3cc9..26694d965e7 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.209"; + version = "4.14.210"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "171b31c4rz9sn95s4s4yqchd4s46kivmvch78z0jr5zir1f4c0nb"; + sha256 = "067xqi6sgf50p7s3n6y77cgf5bj5062s3bz3kqpp6f9wnk85267r"; }; } // (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 7b01bdd8c60..15a5e1972a6 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.160"; + version = "4.19.161"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "118maapizgqgrgawnw7xmbcz26c61g5d012jzbd8l7n6z4354d0q"; + sha256 = "0h9wskmz9wridwnicnjlcmj1112qnlvqk01bhjkxv6b8jsajjh87"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d679969d589..599d6863620 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.246"; + version = "4.4.247"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15xd1dqw53kwqvsa71nr1ymp0jp22pkl4h2yks4hqbd132zxw2wy"; + sha256 = "1jh7vmyx55krk6y2r9v48liifs5wwkgns3gp8rs5sm4klfm36r2a"; }; } // (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 c5216f2c80e..9169506536a 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.246"; + version = "4.9.247"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xd9vgc4yj2vrr5r76cy3fp9a1fc3086lj5aws68wf1dsz3ndqj9"; + sha256 = "1mngdbsq8pdzd0x9hif4715cc7wzc3ahgp1yrknnqk598q0fnfpp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0b19291a769..8453ec0c6cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.80"; + version = "5.4.81"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1iv4rsc9mr13xqzayzwz8mpdrdpnc425mn1izz9hylrw3xf45nj9"; + sha256 = "09w4bpr3v9rzcvxics5wddabplwbpk1mynl45lh9csbjfpjbsw4l"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index c32ee2844f9..e71044b0d96 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.11"; + version = "5.9.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0q6jlnigyjjnnxw6l724zv8acgs95s3pafabz4l9jrhhlijhmcjy"; + sha256 = "1gfrn3sz3h4cbsf3r8f9jxja400qsmbrk8sclk4cjx1l5qcmczyr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 50c69deeb07..5bf74ffd377 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc5"; + version = "5.10-rc6"; extraMeta.branch = "5.10"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "117yvvzdbf8garx484zdp75qgldj8xhr2sqk6mza6lgv4h7v3f4g"; + sha256 = "14ykzs98r918sqv7lddlps4r7hza1zgw0x67mmj77cmqiv6d8ffi"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5fc60b404d8..b16dd3997f6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "455.38"; - sha256_64bit = "0x6w2kcjm5q9z9l6rkxqabway4qq4h3ynngn36i8ky2dpxc1wzfq"; - settingsSha256 = "1hk4yvbb7xhfwm8jiwq6fj5m7vg3w7yvgglhfyhq7bbrlklfb4hm"; - persistencedSha256 = "00mmazv8sy93jvp60v7p954n250f4q3kxc13l4f8fmi28lgv0844"; + version = "455.45.01"; + sha256_64bit = "6tyMfggvZVQPp/aiSdgwn7VG/mIGb0lUcnAdyMEDoVM="; + settingsSha256 = "70ABqnO/heCp/5IztpU0Lo7eZd4n4wUoTlp1xIQ3aCc="; + persistencedSha256 = "36sM+djZvm77Gle7dcZ5tppgzQkD4IA0FJgCGsdZRI8="; } else legacy_390; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 74042cf7023..66f5dcf338a 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202010"; + version = "202011"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "00i7bp7hqwnphh7qyjydvz5s14ydj8rwivz995bdnd37582dyij9"; + sha256 = "09p8drp9xvvs5bahgnr9xx6987fryz27xs2zaf1mr7a9wsh5j912"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5406dcf77eb..a83e554b6f0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -49,13 +49,11 @@ let patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' '' + optionalString buildUser '' - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${util-linux}/bin/umount" \ - --replace "/bin/mount" "${util-linux}/bin/mount" - substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure @@ -65,7 +63,6 @@ let substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./contrib/initramfs/hooks/Makefile.am \ --replace "/usr/share/initramfs-tools/hooks" "$out/usr/share/initramfs-tools/hooks" @@ -82,15 +79,10 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' - ${optionalString isUnstable '' substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" - ''} - - substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "/bin/rm " "${coreutils}/bin/rm " substituteInPlace ./cmd/vdev_id/vdev_id \ --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ @@ -178,10 +170,10 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - homepage = "https://zfsonlinux.org/"; + homepage = "https://github.com/openzfs/zfs"; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; + maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; }; }; in { @@ -193,9 +185,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.5"; + version = "2.0.0"; - sha256 = "0vhd3zs2i83pd59nk0llml4vyk4fc178j6nhg00p6k3f6r0l655b"; + sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; }; zfsUnstable = common { @@ -203,9 +195,8 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc6"; + version = "2.0.0"; - sha256 = "0p027x9hsawniwa9h3yayfbcx010anwcfy45rqgkg2r91zr2nfvw"; - isUnstable = true; + sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; }; } diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index eef9054ae70..81cd2db7bd0 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.6"; + version = "1.9.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1jrvh4khxr12dzmsyfn8ch26rlk4cd65fqafsr7prjjbbjnpmgck"; + sha256 = "06brmzj3h6my0pvi5n261180bfwgfn923702837jmkz7snpsdr9q"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1zz3hhngvx7989m73cp5a9j6spg42hgqd9vs8v332fvcr277lyxj"; + vendorSha256 = "1mc567zgymfz8iy6bg603f857c05xfna1npk2hh490dsnskkfag0"; doCheck = false; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 924625ebd78..a7fb1d0e7e5 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -20,6 +20,12 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; + # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` + # argument for Go builds which apparently breaks the UI like this: + # + # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory + allowGoReference = true; + vendorSha256 = import ./vendor-sha.nix; doCheck = false; diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index bef6744d131..0174f8af43f 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.28.0"; + version = "1.30.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "15q32blkhmc5w1b2xh45y7cag8f6bw9bgiwin5ykrzj5d305wd16"; + sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix"; }; - vendorSha256 = "1gzkb2j2hl6ln8i5wjk2n9g8agpdzy1pzghb4sy1r8pdfp0i28r3"; + vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z"; subPackages = [ "." ]; doCheck = false; # Broken diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 01a07a9f502..d90357044f5 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.55"; + name = "lighttpd-1.4.56"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va"; + sha256 = "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4"; }; postPatch = '' diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 734dfb04140..96451764990 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -8,15 +8,19 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.17.8"; - version = "${nginxVersion}.2"; + nginxVersion = "1.19.3"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1813w33hjm1hcqvl3b3f67qgi5zfjiqg6s01hiy12a5j3jqilcig"; + sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; }; - fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + # generic.nix applies fixPatch on top of every patch defined there. This + # allows updating the patch destination, as openresty has nginx source code + # in a different folder. + fixPatch = patch: + let name = patch.name or (builtins.baseNameOf patch); in runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ @@ -40,9 +44,9 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = "http://openresty.org"; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; + homepage = "http://openresty.org"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; }; } diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index baa1e6c1c6e..3c1b9ff2da3 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.2236"; + version = "0.16.2269"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1qra5qcm7bwplkrmy6haf1kk3gpj9jjvgl0y7rs81jn15cjp6fmq"; + sha256 = "0bzyp2jjbfjh1xr2ga8vl6vyjhwks824sa8r1g5iydn9y36am7pf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 7c2ac16399f..8d144148975 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,13 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "06pr9zqfd7nq13pgg02px2d9rp7phxlmnirpkdfgbw799zrfvpag"; + sha256 = "07814hk6nmvvkf7xklrin24vp17wm6nby358gk20ri4man822q8c"; }; vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 0245f087c93..e6a9f95a1b9 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.17.0"; + version = "0.19.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "1dla70k6rxg34qzspq0j12zcjk654jrf3gm7gd45w4qdg8h2fyyg"; + sha256 = "1wa2xby7v45f9idnhbkglknipm24wqx7mxmkyqz3amq17j4xfy7c"; }; meta = { diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6ccd2e1c8dd..97c7341c76d 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { description = "A massively scalable open source NoSQL database"; platforms = platforms.unix; license = licenses.asl20; - maintainers = with maintainers; [ cransom ]; + maintainers = []; }; } diff --git a/pkgs/servers/peach/default.nix b/pkgs/servers/peach/default.nix new file mode 100644 index 00000000000..59d5a6c2f60 --- /dev/null +++ b/pkgs/servers/peach/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "peach"; + version = "0.9.8"; + + src = fetchFromGitHub { + owner = "peachdocs"; + repo = "peach"; + rev = "v${version}"; + sha256 = "1pzk3sah39hz8n1kswxl35djh6wm0qcfcwrbfi50nd4k3bdgz7xl"; + }; + + vendorSha256 = "0f215hd5a9d4fyvdirp2j14ghap5vwv12i28jmzm6wxjihj8nn1g"; + + meta = with lib; { + description = "Web server for multi-language, real-time synchronization and searchable documentation"; + homepage = "https://peachdocs.org/"; + license = licenses.asl20; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 16fa6a7196a..fd02fc77081 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, poetry, nixosTests }: +{ lib, python3, fetchFromGitHub, nixosTests }: let python = python3.override { diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 7ed3bf8bfec..e27048b2723 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -1,6 +1,10 @@ { stdenv , fetchurl , dpkg +, writeScript +, curl +, jq +, common-updater-scripts }: # The raw package that fetches and extracts the Plex RPM. Override the source @@ -8,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.20.5.3600-47c0d9038"; + version = "1.21.0.3711-b509cc236"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "18zj4baa085gbgc0y5gx7gnwzl131xyk34m5xcipfvfb434y98cp"; + sha256 = "0nhxxfcds3byhbz8gsd9107diy182m33xbcc8jgi78hwfadyjj7h"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "01rq2q6avjsvnns7jsd2a9vnmd4584fwdkp833gjgrrrqkf6h45y"; + sha256 = "0izsmcc337paakz1nqfsr78s097sxyxy3kbs43qpzpx7w5wshynb"; }; outputs = [ "out" "basedb" ]; @@ -52,6 +56,27 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontAutoPatchelf = true; + passthru.updateScript = writeScript "${pname}-updater" '' + #!${stdenv.shell} + set -eu -o pipefail + PATH=${stdenv.lib.makeBinPath [curl jq common-updater-scripts]}:$PATH + + plexApiJson=$(curl -sS https://plex.tv/api/downloads/5.json) + latestVersion="$(echo $plexApiJson | jq .computer.Linux.version | tr -d '"\n')" + + for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + arch=$(echo $platform | cut -d '-' -f1) + dlUrl="$(echo $plexApiJson | jq --arg arch "$arch" -c '.computer.Linux.releases[] | select(.distro == "debian") | select(.build | contains($arch)) .url' | tr -d '"\n')" + + latestSha="$(nix-prefetch-url $dlUrl)" + + # The script will not perform an update when the version attribute is up to date from previous platform run + # We need to clear it before each run + update-source-version plexRaw 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform + update-source-version plexRaw "$latestVersion" "$latestSha" --system=$platform + done + ''; + meta = with stdenv.lib; { homepage = "https://plex.tv/"; license = licenses.unfree; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 254c24754c2..94a15d35489 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "0x8di6zkbn7v77awlybp3m722a27kw20vrpjgalifv8p87238x24"; + sha256 = "094brxiiapm7402q0ysaha2xk3wymc2kz8vqisjyiswz7wf4wsx0"; }; - vendorSha256 = "0p7d0c6zgbzj7wd2qdz578cgamydl6mp5sc8jmvnwb50h10n45af"; + vendorSha256 = "007dyw825jsfma7sq5llxllhrzbkhqxr985s1nhg5cdd803gz42p"; # Tests need docker doCheck = false; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index f6b0574fa5c..f2cbb2f820c 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -20,14 +20,14 @@ let ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.1.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1zp8cxz56qmai1z6xcscnq85gxhv64dv1s5zqsqdn0zpbxyqqdlr"; + sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 72e636b303f..4e9ef3e0b58 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "tarssh"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Freaky"; repo = pname; - sha256 = "0fm0rwknhm39nhd6g0pnxby34i5gpmi5ri795d9ylsw0pqwz6kd0"; + sha256 = "1waxfbw9lqbqv8igb291pjqg22324lzv4p7fsdfrkvxf95jd2i03"; }; - cargoSha256 = "108xdpgfgfd4z455snif0mzbla0rv8gjqxci5qgwjzfyshwkprgv"; + cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j"; meta = with stdenv.lib; { description = "A simple SSH tarpit inspired by endlessh"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 3cdd331f3b1..3072b44e4a3 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -54,7 +54,7 @@ in { }; unifiBeta = generic { - version = "6.0.28"; - sha256 = "14q8r4mcqx0v3sh8zwqg4cc3iszqn5201q5r4c20cwqdd4ivf97q"; + version = "6.0.36"; + sha256 = "1sjf4jd8jkf6194ahwqjxd2ip0r70bdk15gci1qrdw88agab143j"; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 421bb8502a4..25cde589a92 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,6 +47,12 @@ in with pkgs; rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' @@ -199,6 +205,12 @@ in with pkgs; rec { dist = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + buildCommand = '' mkdir -p $out/nix-support echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index c8e8528cff1..2c11b6f4523 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1bxzwcj7jxv1hkbq84wigshni1ivdga7g77k3h9fxzn7c223yccd"; + sha256 = "12p95nybsisqpji01qgkp5wfg7fwk814xdsz338q9wac8nvqw9w3"; }; - cargoSha256 = "1bf0r9kymc1w1rxpc0bjgj5faagmad9vh404n9860rpganrdjvkx"; + cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index df3aa7bd945..ffe5d25bd9c 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0d9lb1wzvxywg88fy85bicixd8wipvbhnwfckwl3p8shh0s9sr22"; + sha256 = "1ylk6n062n9w2c8179mj0z5acz98b30w6dkpz8gslachsz9sb5ij"; }; - vendorSha256 = "0sashi3x3hccqm27dg6hjlvpgvx42jdxpgzigzm81md58zhk509x"; + vendorSha256 = "0kljvy61n72dg99jyc47fzhc8ihyfjk30a1a031gczk3q3z2l7kj"; subPackages = [ "cmd/trivy" ]; @@ -32,6 +32,7 @@ buildGoModule rec { application dependencies (Bundler, Composer, npm, yarn, etc.). ''; homepage = src.meta.homepage; + changelog = "${src.meta.homepage}/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ jk ]; }; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 4ab394516a8..e33ff98587b 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.08.09"; + version = "2020.11.07"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl"; + sha256 = "0zwzgqy1wa7yd2cm6spq11lw21mdn92lx8qzrxpk9kxcl03mv5jd"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix new file mode 100644 index 00000000000..770e898f2ee --- /dev/null +++ b/pkgs/tools/audio/tts/default.nix @@ -0,0 +1,123 @@ +{ lib +, python3Packages +, fetchFromGitHub +, fetchpatch +, python3 +}: + +# +# Tested in the following setup: +# +# TTS model: +# Tacotron2 DDC +# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5 +# Vocoder model: +# Multi-Band MelGAN +# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD +# +# Arrange /tmp/tts like this: +# scale_stats.npy +# tts +# tts/checkpoint_130000.pth.tar +# tts/checkpoint_130000_tf.pkl +# tts/checkpoint_130000_tf_2.3rc0.tflite +# tts/config.json +# tts/scale_stats.npy +# vocoder +# vocoder/checkpoint_1450000.pth.tar +# vocoder/checkpoint_2750000_tf.pkl +# vocoder/checkpoint_2750000_tf_v2.3rc.tflite +# vocoder/config.json +# vocoder/scale_stats.npy +# +# Start like this: +# cd /tmp/tts +# tts-server \ +# --vocoder_config ./tts/vocoder/config.json \ +# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \ +# --tts_config ./tts/config.json \ +# --tts_checkpoint ./tts/checkpoint_130000.pth.tar +# +# For now, for deployment check the systemd unit in the pull request: +# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 +# + +python3Packages.buildPythonApplication rec { + pname = "tts"; + # until https://github.com/mozilla/TTS/issues/424 is resolved + # we treat released models as released versions: + # https://github.com/mozilla/TTS/wiki/Released-Models + version = "unstable-2020-06-17"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "TTS"; + rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381"; + sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch"; + sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc="; + }) + ]; + + preBuild = '' + # numba jit tries to write to its cache directory + export HOME=$TMPDIR + sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py + sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py + sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py + sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py + # Not required for building/installation but for their development/ci workflow + sed -i -e '/pylint/d' requirements.txt setup.py + sed -i -e '/cardboardlint/d' requirements.txt setup.py + ''; + + + propagatedBuildInputs = with python3Packages; [ + matplotlib + scipy + pytorch + flask + attrdict + bokeh + soundfile + tqdm + librosa + unidecode + phonemizer + tensorboardx + fuzzywuzzy + tensorflow_2 + inflect + gdown + pysbd + ]; + + postInstall = '' + cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server + ''; + + checkInputs = with python3Packages; [ pytestCheckHook ]; + + disabledTests = [ + # RuntimeError: fft: ATen not compiled with MKL support + "test_torch_stft" + "test_stft_loss" + "test_multiscale_stft_loss" + # AssertionErrors that I feel incapable of debugging + "test_phoneme_to_sequence" + "test_text2phone" + "test_parametrized_gan_dataset" + ]; + + meta = with lib; { + homepage = "https://github.com/mozilla/TTS"; + description = "Deep learning for Text to Speech"; + license = licenses.mpl20; + maintainers = with maintainers; [ hexa mic92 ]; + }; +} diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 278ee3ad25e..a2702f993a6 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wal-g"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "1clsh42sgfrzyg3vr215wrpi93cb8y8ky3cb1v2l6cs4psh3py1q"; + sha256 = "030c949cs13x4gnby6apy1adis8d4dlg3gzhhhs991117dxb0i3v"; }; - vendorSha256 = "1ax8niw4zfwvh5ikxnkbsjc9fdz1lziqlwig9nwrhzfp45ysbakh"; + vendorSha256 = "186cqn10fljzjc876byaj1affd8xmi8zvmkfxp9dbzsfxdir4nf7"; buildInputs = [ brotli ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 80a3a2a9448..b75a902681e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -122,10 +122,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.5"; + version = "15.2.6"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; + sha256 = "093pphgqrkrbv3484ayl0vac6a6s53zxa01yad0cbvnx0kyj55hh"; }; in rec { ceph = stdenv.mkDerivation { @@ -135,11 +135,6 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch ./ceph-glibc-2-32-sigdescr_np.patch - (fetchpatch { - name = "CVE-2020-25660"; - url = "https://github.com/ceph/ceph/compare/2c93eff00150f0cc5f106a559557a58d3d7b6f1f...6c14c2fb5650426285428dfe6ca1597e5ea1d07d.patch"; - sha256 = "032hl15q34gq7y6bnljmklpsbd3bpkzmg7r3w0x0ly786iz7zwhm"; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index ba7d5456d86..60670708f4b 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "0j7nbxzv85as76glzk4cf7j6ggfihcjaihp06s0zcar4i7zaiy9z"; + sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix new file mode 100644 index 00000000000..03a801abbeb --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify +, librime, brise }: + +stdenv.mkDerivation rec { + pname = "ibus-rime"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "ibus-rime"; + rev = version; + sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy"; + }; + + buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ]; + nativeBuildInputs = [ cmake pkg-config ]; + + makeFlags = [ "PREFIX=$(out)" ]; + dontUseCmakeConfigure = true; + + prePatch = '' + substituteInPlace Makefile \ + --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data' + + substituteInPlace rime_config.h \ + --replace '/usr' $out + + substituteInPlace rime_config.h \ + --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \ + 'IBUS_RIME_SHARED_DATA_DIR "${brise}"' + + substituteInPlace rime.xml \ + --replace '/usr' $out + ''; + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "Rime input method engine for IBus"; + homepage = "https://rime.im/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pengmeiyu ]; + }; +} diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix new file mode 100644 index 00000000000..41562ccbf71 --- /dev/null +++ b/pkgs/tools/misc/archi/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchurl +, fetchzip +, autoPatchelfHook +, libsecret +}: + +stdenv.mkDerivation rec { + pname = "Archi"; + version = "4.7.1"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz"; + sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw"; + } + else if stdenv.hostPlatform.system == "x86_64-darwin" then + fetchzip { + url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip"; + sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc"; + } + else + throw "Unsupported system"; + + buildInputs = [ + libsecret + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = + if stdenv.hostPlatform.system == "x86_64-linux" then + '' + mkdir -p $out/bin + for f in configuration features p2 plugins Archi.ini Archi; do + cp $f $out/bin/ + done + + install -D -m755 Archi $out/bin/Archi + '' + else + '' + mkdir -p "$out/Applications" + mv Archi.app "$out/Applications/" + ''; + + meta = with stdenv.lib; { + description = "ArchiMate modelling toolkit"; + longDescription = '' + Archi is an open source modelling toolkit to create ArchiMate + models and sketches. + ''; + homepage = "https://www.archimatetool.com/"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ earldouglas SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index e5c528596b0..53b89a07224 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchCrate { inherit pname version; - sha256 = "1yzj1k09yd3q2dff6a6m0xv2v6z681x25g0x5ak41lm5rn3hj8vl"; + sha256 = "0rxk6dsbn960ikmp6f8a98g3dlibzfy9gcbdina37403kxv8bs6v"; }; - cargoSha256 = "1axcnr7bzplchpz4cdy5872fmrnzrs1p665c0vmxzs9bgnml5sl8"; + cargoSha256 = "14fc53xl8f19z8cjrgn6qafiymgirmsin2nzh4i3qprmcc52all8"; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 1c38e7c3b8f..ceef26b577d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, unstableGitUpdater , makeWrapper , curl , ncurses @@ -35,6 +36,8 @@ stdenv.mkDerivation { --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; @@ -42,4 +45,3 @@ stdenv.mkDerivation { homepage = "https://github.com/chubin/cheat.sh"; }; } - diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 9d5fbcba23f..8813ec5a14e 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "1gs9hmkc25013nk8b7d7pcxcp4jmk4pa4gcki3wgvlrzjl1av7w4"; + sha256 = "0g9zr2afi103cwv6ikpmmyh5v055dh47l3wj9a1kbxgms0953iwh"; }; - cargoSha256 = "13lw7isg9lfn6dfngq15qbq619c644ixa5bvb1ja0l3hm3akrs5g"; + cargoSha256 = "0hydlaibanw2vjyxymfbzgwwk2qjv7jsz15gn66ga5vknsqihcrx"; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 486bdfdaa89..2f736a63d97 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0318fw04fman20hjdjsgix6fg4fp85mrsm3bb629kxn30xi6wsh3"; + sha256 = "0hkl0wb1xsq7z7gbmblq4fj42llw58lxgvm41z7bliq8a2qg3hv9"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index b2aa0a16f92..a33ae0ed330 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0g7yj2a3cddaaa0n38zjqq79w5xs3sqa9zwqn2ffr2wr6y80754i"; + sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 95944d566df..31e925af6ce 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.147.2"; + version = "0.148.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1pzbwjqnb2l1845dqmx5s2xyxv7088yz2888bjwm0qs8pm1l6spi"; + sha256 = "11dzh5scfwf8lm0rw5f3z0plix5p4mmvgigzav2g59p0wdw3v3jy"; }; - vendorSha256 = "1qwggbgfvgx1anh55jx2lj0x59h5j3wixb8r2ylaynrrxx1b167w"; + vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d"; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/tools/misc/hdl-dump/default.nix new file mode 100644 index 00000000000..96e81fe8bd4 --- /dev/null +++ b/pkgs/tools/misc/hdl-dump/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, upx +}: + +let + version = "20202807"; + pname = "hdl-dump"; +in stdenv.mkDerivation { + inherit pname version; + + # Using AkuHAK's repo because playstation2's repo is outdated + src = fetchFromGitHub { + owner = "AKuHAK"; + repo = pname; + rev = "be37e112a44772a1341c867dc3dfee7381ce9e59"; + sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41"; + }; + + buildInputs = [ upx ]; + + makeFlags = [ "RELEASE=yes" ]; + + installPhase = '' + install -Dm755 hdl_dump -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/AKuHAK/hdl-dump"; + description = "PlayStation 2 HDLoader image dump/install utility"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 5a606411441..ab22e413b00 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -4,6 +4,7 @@ , libirecovery , libzip , libusbmuxd +, IOKit }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { # Not listing other dependencies specified in # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # because they are inherited `libimobiledevice`. - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; @@ -51,8 +52,8 @@ stdenv.mkDerivation rec { This will download and restore a device to the latest firmware available. ''; license = licenses.lgpl21Plus; - # configure.ac suggests it should work for darwin and mingw as well but not tried yet - platforms = platforms.linux; + # configure.ac suggests it should work for mingw as well but not tried yet + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/tools/misc/rmtrash/default.nix index 073871b0f43..d50079f82c2 100644 --- a/pkgs/tools/misc/rmtrash/default.nix +++ b/pkgs/tools/misc/rmtrash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "rmtrash"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "PhrozenByte"; repo = pname; rev = "v${version}"; - sha256 = "04a9c65wnkq1fj8qhdsdbps88xjbp7rn6p27y25v47kaysvrw01j"; + sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index fbed27a2447..8321d03a48f 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "spigot"; - version = "20200101"; + version = "20200901"; src = fetchgit { url = "https://git.tartarus.org/simon/spigot.git"; - rev = "b1b0b202b3523b72f0638fb31fd49c47f4abb39c"; - sha256 = "0lh5v42aia1hvhsqzs515q0anrjc6c2s9bjklfaap5gz0cg59wbv"; + rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae"; + sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf"; }; nativeBuildInputs = [ autoreconfHook halibut perl ]; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 23fdc2f7135..9b38db5a727 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "0cb1n0skanwwkwgzlswwhvfb4iji1bw9iqskmczlhakpw3j1yaqa"; + sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv"; }; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { homepage = "https://landley.net/toybox/"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin ++ freebsd; + # https://github.com/NixOS/nixpkgs/issues/101229 + broken = stdenv.isDarwin; maintainers = with maintainers; [ hhm ]; priority = 10; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 1525d3a2296..d7b141153f4 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { description = "A high-performance logs, metrics, and events router"; homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice happysalada ]; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8fa46a78694..a7b42471494 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,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 = "2020.11.29"; + version = "2020.12.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "10px5wnsjw4lzdh75810q4sjbhnd7cjxwpa3crapd3yj0f3bwa76"; + sha256 = "0wkslmqiydlzrla4wx67757b18r4l9h42fkfzdcxx6n0ygiv4qbi"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index f739e80be1f..8d7d2392dfb 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -1,12 +1,12 @@ -{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: +{ stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }: let -version = "2.4"; +version = "2.5"; apk = stdenv.mkDerivation { pname = "gnirehtet.apk"; inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; - sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g"; + sha256 = "1db0gkg5z8lighhkyqfsr9jiacrck89zmfnmp74vj865hhxgjzgq"; }; installPhase = '' mkdir $out @@ -22,19 +22,18 @@ rustPlatform.buildRustPackage { owner = "Genymobile"; repo = "gnirehtet"; rev = "v${version}"; - sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; + sha256 = "0wk6n082gnj9xk46n542h1012h8gyhldca23bs7vl73g0534g878"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; + cargoSha256 = "0i7f52r697gjw30m8k60hd3y6wsn5lpz419r083a1rhpbinzd26q"; - patchFlags = [ "-p2" ]; - patches = [ - (substituteAll { - src = ./paths.patch; - adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"; - inherit apk; - }) - ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnirehtet \ + --set GNIREHTET_APK ${apk}/gnirehtet.apk \ + --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb + ''; meta = with stdenv.lib; { description = "Reverse tethering over adb for Android"; diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch deleted file mode 100644 index e5df4b8e4fe..00000000000 --- a/pkgs/tools/networking/gnirehtet/paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: gnirehtet/relay-rust/src/main.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/main.rs -+++ gnirehtet/relay-rust/src/main.rs -@@ -299,7 +299,7 @@ impl Command for RelayCommand { - - fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { - info!(target: TAG, "Installing gnirehtet client..."); -- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"]) -+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"]) - } - - fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { -@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>( - args: Vec<S>, - ) -> Result<(), CommandExecutionError> { - let adb_args = create_adb_args(serial, args); -- debug!(target: TAG, "Execute: adb {:?}", adb_args); -- match process::Command::new("adb").args(&adb_args[..]).status() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args); -+ match process::Command::new("@adb@").args(&adb_args[..]).status() { - Ok(exit_status) => { - if exit_status.success() { - Ok(()) -@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S - serial, - vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], - ); -- debug!(target: TAG, "Execute: adb {:?}", args); -- match process::Command::new("adb").args(&args[..]).output() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", args); -+ match process::Command::new("@adb@").args(&args[..]).output() { - Ok(output) => { - if output.status.success() { - // the "regex" crate makes the binary far bigger, so just parse the versionCode -Index: gnirehtet/relay-rust/src/adb_monitor.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/adb_monitor.rs -+++ gnirehtet/relay-rust/src/adb_monitor.rs -@@ -206,7 +206,7 @@ impl AdbMonitor { - - fn start_adb_daemon() -> bool { - info!(target: TAG, "Restarting adb daemon"); -- match process::Command::new("adb") -+ match process::Command::new("@adb@") - .args(&["start-server"]) - .status() { - Ok(exit_status) => { diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 56fe9b14687..ece9c47ae68 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "0.1.7"; + version = "1.0.1-post2"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "v${version}"; - sha256 = "0sdv6mf7mrgsdinv94mhai5jaw04s6r9cq0wxkph9b4hhywi0lys"; + sha256 = "0cvbwxvq1cj9xcjc3hnxrpq9yrmfkapy533cbjzsjmvgiqk11hps"; }; - cargoSha256 = "0rrqjlyn7k8f7ndzra16a9k4l6mjfim84lfi886q3irbn234b1va"; + cargoSha256 = "0vdhincvfassj7gbiplwbi43yyic3l6wlc32s6ci68b2wjmff8pn"; meta = with lib; { description = "Ping, but with a graph"; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 2c1732007b5..9f01962250d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd"; + sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 1439b62bc94..8bf90293a8e 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0ibk222fwgjaxrmhrk5avcmmbj52ibcsydm2m02xnlpr8kcqsjnc"; + sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 2c626e81cd2..e452719a494 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-11-17T00-39-14Z"; + version = "2020-11-25T23-04-07Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "122fb9ghxwjifhvwiw07pm3szqfj3pc55m4bhq3v8nshzwrbcjf4"; + sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7"; }; - vendorSha256 = "148fb86v059skcf8dgcrqibwkl1h4lbwi60qnwmdi03q6rvaw33m"; + vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv"; doCheck = false; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index c0a132b481e..1ebd8d8be6a 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "0yz1vbqa3sppkjmny5ipnspsdi5gnix7wb6hzvdkm9h1rj2kb8ci"; + sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 66ea91a56d4..f10b90d0173 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1j9b6kkhlw2sx6qwnxkhsk7bj9vm2vr0z1hj1jf257fxw9m2q6mz"; + sha256 = "08qz9zfk19iwf8qfv7vmzvbl8w1vpjrry25w3pxsg93gyjw8v7mi"; }; - vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs"; + vendorSha256 = "0qnfd47ykb6g28d3mnfncgmkvqd1myx47x563sxx4lcsq542q83n"; doCheck = false; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 42eae8d9ffd..c17a1a82d9f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -199,13 +199,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201118_79aa7d9"; + suffix = "pre20201201_5a6ddb3"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "79aa7d95183cbe6c0d786965f0dbff414fd1aa67"; - sha256 = "0aa0xggrczylwp3da3q9m4ad9j6gzi7wpa3ph4i8a1ng36kl91c7"; + rev = "5a6ddb3de14a1684af6c793d663764d093fa7846"; + sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 9761bf112b9..777e7292fde 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -2,22 +2,17 @@ , fetchurl , appimageTools , makeWrapper -, electron_9 +, electron_11 , openssl }: -let - electron = electron_9; - -in - stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.5-2"; + version = "0.9.6"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1fj8gab5frxnzx6cafkcxmic9z1wvfqi4v511wsg9dy4mn5dc6qw"; + sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h"; }; nativeBuildInputs = [ makeWrapper ]; @@ -51,7 +46,7 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/usr/share/icons $out/share # Wrap the application with Electron. - makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ + makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" ''; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index f72c916acf9..53bc45acf8f 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,8 +1,14 @@ -{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: +{ stdenv +, fetchFromGitHub +, unstableGitUpdater +, makeWrapper +, openssl +, coreutils +, gnugrep }: stdenv.mkDerivation { - pname = "bash-supergenpass-unstable"; - version = "2018-04-18"; + pname = "bash-supergenpass"; + version = "unstable-2018-04-18"; nativeBuildInputs = [ makeWrapper ]; @@ -18,6 +24,8 @@ stdenv.mkDerivation { wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { description = "Bash shell-script implementation of SuperGenPass password generation"; longDescription = '' @@ -36,4 +44,3 @@ stdenv.mkDerivation { homepage = "https://github.com/lanzz/bash-supergenpass"; }; } - diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 8cf904c39c5..4f1e90eb910 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.6"; pname = "volatility"; + version = "2.6.1"; - src = fetchurl { - url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip"; - sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; + src = fetchFromGitHub { + owner = "volatilityfoundation"; + repo = pname; + rev = version; + sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf"; }; doCheck = false; diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 6763b476f30..29f976998d5 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -1,15 +1,18 @@ -{stdenv, fetchurl, perl}: +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "daemon"; + version = "0.7"; -stdenv.mkDerivation { - name = "daemon-0.6.4"; src = fetchurl { - url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz"; - sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; + url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; + sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; }; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perl ]; - meta = { + meta = with stdenv.lib; { description = "Turns other processes into daemons"; longDescription = '' Daemon turns other process into daemons. There are many tasks that need @@ -18,8 +21,8 @@ stdenv.mkDerivation { writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh, Java). ''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 1ef25fd0823..1ed1d913516 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROC-smi"; rev = "rocm-${version}"; - sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni"; + hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ="; }; format = "other"; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3bacd53c713..ca71c3a1b3d 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.9.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "1i9bcpfjnl2yjnfmf0ar1l62zwq01ph0yylz0dby8k2l7cvq5ci6"; + sha256 = "02jqbxnchljyqnmlbxjaf5zpdi03gxapfy38dfikl5j4f7yyxvjs"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix new file mode 100644 index 00000000000..3972d3dc9bd --- /dev/null +++ b/pkgs/tools/text/pbgopy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pbgopy"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "nakabonne"; + repo = pname; + rev = "v${version}"; + sha256 = "17rk15hs7kg9m1vphh1gjny7sqnk80qw61jn8qyxcmw2n55rkmfp"; + }; + + vendorSha256 = "1ak3hd979395grbns9p5sw5f45plcqq6vg7j7v8n7xqc20s2l8m9"; + + meta = with stdenv.lib; { + description = "Copy and paste between devices"; + homepage = "https://github.com/nakabonne/pbgopy"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index d20ce99dd74..6f484bed8bc 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, python3Packages }: -pythonPackages.buildPythonPackage rec { +let pname = "rst2html5"; - version = "1.9.4"; + version = "1.10.6"; +in python3Packages.buildPythonPackage { + inherit pname version; + format = "wheel"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg="; }; - propagatedBuildInputs = with pythonPackages; + propagatedBuildInputs = with python3Packages; [ docutils genshi pygments beautifulsoup4 ]; - meta = with stdenv.lib;{ - homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; + meta = with lib;{ + homepage = "https://pypi.org/project/rst2html5/"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 1d1def43177..70599963905 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1ybrx82c4djp7izyqhvzk0rcf9ac7nv5g5ahxr0k0jhm752ba5z2"; + sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp"; }; vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; diff --git a/pkgs/tools/text/ucg/default.nix b/pkgs/tools/text/ucg/default.nix new file mode 100644 index 00000000000..db898453680 --- /dev/null +++ b/pkgs/tools/text/ucg/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, pcre +, nixosTests +}: + +let + pname = "ucg"; + version = "20190225"; +in stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "gvansickle"; + repo = pname; + rev = "c3a67632f1e3f332bfb102f0db167f34a2e42da7"; + sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ pcre ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gvansickle/ucg/"; + description = "Grep-like tool for searching large bodies of source code"; + longDescription = '' + UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized + for searching large bodies of source code. It is intended to be largely + command-line compatible with Ack, to some extent with ag, and where + appropriate with grep. Search patterns are specified as PCRE regexes. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; + + passthru.tests = { inherit (nixosTests) ucg; }; +} diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 0a9ec734e3a..893f54eedc6 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.6.3"; + version = "2.6.4"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1svzsm40jm694s5gxg807k0jib8pl5vk2rb2ih8qr9bb23a4h95x"; + sha256 = "192w98ghfldxamkx717wqa4v3lsr2imlf8xd6ygjpgx78b5zvvcx"; }; vendorSha256 = null; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 9705a6d8798..25fc794b055 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -85,11 +85,12 @@ in stdenv.mkDerivation rec { cp ${src}/pdftk.1 $out/share/man/man1 ''; - meta = { + meta = with stdenv.lib; { description = "Command-line tool for working with PDFs"; homepage = "https://gitlab.com/pdftk-java/pdftk"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin averelld ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin averelld ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 813a464b770..0e90e1cf614 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, gettext -, guile, guile-reader, guile-lib -, ploticus, imagemagick -, ghostscript, transfig +{ stdenv +, fetchurl +, pkgconfig +, gettext +, guile +, guile-reader +, guile-lib +, ploticus +, imagemagick +, ghostscript +, transfig , enableEmacs ? false, emacs ? null , enableLout ? true, lout ? null , enableTex ? true, tex ? null -, makeWrapper }: - -with stdenv.lib; -stdenv.mkDerivation rec { +, makeWrapper +}: +let pname = "skribilo"; - version = "0.9.4"; + version = "0.9.5"; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; - sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; + sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -33,7 +42,7 @@ stdenv.mkDerivation rec { --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" ''; - meta = { + meta = with stdenv.lib;{ description = "The Ultimate Document Programming Framework"; longDescription = '' Skribilo is a free document production tool that takes a diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 672d5af68c8..030ac1b43aa 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -4,7 +4,7 @@ , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python2Packages, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr -, cairo, pixman, xorg, clisp, biber, xxHash +, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang }: @@ -245,20 +245,20 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "texlive-dvisvgm.bin"; - inherit version; - - inherit (common) src; + version = "2.11"; + # TODO: dvisvgm was switched to build from upstream sources + # to address https://github.com/NixOS/nixpkgs/issues/104847 + # We might want to consider reverting that change in the future. + + src = fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j"; + }; nativeBuildInputs = [ pkgconfig ]; - # TODO: dvisvgm still uses vendored dependencies - buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ]; - - preConfigure = "cd texk/dvisvgm"; - - configureFlags = common.configureFlags - ++ [ "--with-system-kpathsea" ]; + buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ]; enableParallelBuilding = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8061f8c19e..a3c3330ae37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -703,6 +703,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; + archi = callPackage ../tools/misc/archi { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; @@ -1174,6 +1176,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flood = nodePackages.flood; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genpass = callPackage ../tools/security/genpass { @@ -2492,6 +2496,8 @@ in patool = with python3Packages; toPythonApplication patool; + pbgopy = callPackage ../tools/text/pbgopy { }; + pbpst = callPackage ../applications/misc/pbpst { }; pbzx = callPackage ../tools/compression/pbzx { }; @@ -2784,6 +2790,8 @@ in inherit (pythonPackages) gyp; }; + bumpver = callPackage ../applications/version-management/bumpver { }; + bup = callPackage ../tools/backup/bup { }; burp = callPackage ../tools/backup/burp { }; @@ -3037,6 +3045,8 @@ in protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { @@ -4387,6 +4397,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ucg = callPackage ../tools/text/ucg { }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -4742,7 +4754,9 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { + inherit (darwin) IOKit; + }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; @@ -5360,6 +5374,8 @@ in libck = callPackage ../development/libraries/libck { }; + libcork = callPackage ../development/libraries/libcork { }; + libconfig = callPackage ../development/libraries/libconfig { }; libcmis = callPackage ../development/libraries/libcmis { }; @@ -6999,6 +7015,8 @@ in rubocop = callPackage ../development/tools/rubocop { }; + ruffle = callPackage ../misc/emulators/ruffle { }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -7671,6 +7689,8 @@ in tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy {}; @@ -7833,6 +7853,8 @@ in twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twtxt = callPackage ../applications/networking/twtxt { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -10308,14 +10330,16 @@ in dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; - dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; - dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash; - dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs; dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + + dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; + dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; dhallPackages = callPackages ./dhall-packages.nix { }; @@ -10490,6 +10514,12 @@ in phpExtensions = php74Extensions; phpPackages = php74Packages; + php80 = callPackage ../development/interpreters/php/8.0.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + php80Extensions = recurseIntoAttrs php80.extensions; + php80Packages = recurseIntoAttrs php80.packages; + # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10675,6 +10705,8 @@ in solargraph = callPackage ../development/ruby-modules/solargraph { }; + rbenv = callPackage ../development/ruby-modules/rbenv { }; + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -21662,6 +21694,8 @@ in howl = callPackage ../applications/editors/howl { }; + hdl-dump = callPackage ../tools/misc/hdl-dump { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; @@ -21835,6 +21869,8 @@ in id3v2 = callPackage ../applications/audio/id3v2 { }; + ideamaker = callPackage ../applications/misc/ideamaker { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -22177,6 +22213,8 @@ in kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -22374,7 +22412,7 @@ in mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; @@ -23159,6 +23197,8 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; + peach = callPackage ../servers/peach { }; + peaclock = callPackage ../applications/misc/peaclock { stdenv = gccStdenv; }; @@ -23390,6 +23430,8 @@ in boost = boost17x; }; + qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidiarp = callPackage ../applications/audio/qmidiarp {}; @@ -25976,6 +26018,8 @@ in tremulous = callPackage ../games/tremulous { }; + tts = callPackage ../tools/audio/tts { }; + tuxpaint = callPackage ../games/tuxpaint { }; tuxtype = callPackage ../games/tuxtype { }; @@ -26324,7 +26368,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7d805d4c74..793b7b78b0e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -599,6 +599,10 @@ let mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { }; + + mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { }; + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1863ae0b36d..5202aa013e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -598,10 +598,10 @@ let Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.994"; + version = "0.995"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.994.tar.gz"; - sha256 = "4242ecb64aaae09034eddb1b338e005567ace29f2ac2d1bca4d4bcf4e15d21c4"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.995.tar.gz"; + sha256 = "b17fb0b7f97eb86430952bf387b6f08b5252413cb97474d1bf26e3376a4cc496"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; @@ -8429,10 +8429,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.46"; + version = "0.47"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "1iqbs7n8923xjkai51hiczn5an8cskddl7qrfi30axjl1d56h6r0"; + sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -21230,10 +21230,10 @@ let TextFormat = buildPerlModule { pname = "Text-Format"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; - sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.62.tar.gz"; + sha256 = "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx"; }; meta = { homepage = "https://metacpan.org/release/Text-Format"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d4518b60d24..d5bebb9bd84 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -3,7 +3,7 @@ , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit -, readline, rsync, fetchpatch +, readline, rsync, fetchpatch, valgrind }: let @@ -331,7 +331,7 @@ in sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; }); } - { name = "json"; } + { name = "json"; enable = lib.versionOlder php.version "8.0"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; configureFlags = [ @@ -341,7 +341,9 @@ in "LDAP_LIBDIR=${openldap.out}/lib" ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; doCheck = false; } - { name = "mbstring"; buildInputs = [ oniguruma ]; doCheck = false; } + { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + pcre' + ]; doCheck = false; } { name = "mysqli"; internalDeps = [ php.extensions.mysqlnd ]; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; @@ -388,11 +390,13 @@ in # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ]; + buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + valgrind.dev + ]; # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is # included from ZendAccelerator.h, but ZendAccelerator.h is # included after the ifdef... - patches = lib.optional (lib.versionOlder php.version "7.4") [ + patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -456,7 +460,7 @@ in doCheck = false; } # recode (7.3, 7.2) - { name = "session"; } + { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); } { name = "shmop"; } { name = "simplexml"; buildInputs = [ libxml2 pcre' ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c09db155003..75d4245abe2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3371,6 +3371,8 @@ in { leveldb = callPackage ../development/python-modules/leveldb { }; + lexid = callPackage ../development/python-modules/lexid { }; + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; @@ -4611,6 +4613,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-openems = callPackage ../development/python-modules/python-openems { }; @@ -5351,6 +5355,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyosf = callPackage ../development/python-modules/pyosf { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; pyotp = callPackage ../development/python-modules/pyotp { }; @@ -7276,6 +7282,8 @@ in { tinydb = callPackage ../development/python-modules/tinydb { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; + tiros = callPackage ../development/python-modules/tiros { }; tissue = callPackage ../development/python-modules/tissue { }; |